diff --git a/Changelog.yaml b/Changelog.yaml
index 96237e3c8b..33ab86bc1d 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -19,6 +19,65 @@
 #  new recipes:
 #    - title: 
 
+
+- version: 0.7.54
+  date: 2011-04-08
+
+  new features:
+    - title: "New output format, HTMLZ which is a single HTML file with its associated images/stylesheets in a zipped up file"
+      description: "Useful when you want to convert your ebook into a single HTML file for easy editing. Note that this output plugin is still new and needs testing"
+
+    - title: "When dealing with ZIP/RAR archives, use the file header rather than the file extension to detrmine the file type, when possible. This fixes the common case of CBZ files being actually cbr files and vice versa"
+
+    - title: "Support for the Motorola Atrix"
+
+    - title: "Allow the icons in the toolbar to be turned off completely via Preferences->Look & Feel"
+
+    - title: "When downloading metadata use the gzip transfer encoding when possible for a speedup."
+      tickets: [749304]
+  
+  bug fixes:
+    - title: "Conversion pipeline: Workaround for bug in lxml that causes a massive mem leak on windows and OS X when the input document contains non ASCII CSS selectors."
+      tickets: [754555]
+
+    - title: "Conversion pipeline: Handle inline <style> tags that put all the actual CSS inside an XML comment."
+      tickets: [750063]
+
+    - title: "The 'Choose Library' button now shows its popup menu when you already have more than one library instead of the dialog to create a new library"
+      tickets: [754154]
+
+    - title: "Apply all content server setting when clicking the Start Server button in Preferences->Sharing over the net"
+      tickets: [753122]
+
+    - title: "Fix content server breaking if its restriction is set to a saved search that was deleted"
+      tickets: [751950]
+
+    - title: "Fix detection of PocketBook with 2.0.6 firmware on windows"
+      tickets: [750336]
+
+    - title: "ODT Input: Fix handling of the <text:s> element."
+      tickets: [749655]
+
+    - title: "MOBI Output: Don't use self closed tags"
+
+    - title: "Fix book details popup becoming too tall if there is a lot of metadata"
+
+    - title: "Fix new PDF engine crashing on PDF files with embedded fonts with null names"
+
+  improved recipes:
+    - Kommersant
+    - Perfil
+    - Times of India
+    - IHT
+    - Guardian
+
+  new recipes:
+    - title: "Al Ahram"
+      authors: Hassan Williamson
+
+    - title: "F-Secure and developpez.com"
+      authors: louhike
+
 - version: 0.7.53
   date: 2011-04-01
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 10782f85c8..14c93cfc7c 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.53'
+__version__   = '0.7.54'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re, importlib
diff --git a/src/calibre/ebooks/pdf/pdftohtml.py b/src/calibre/ebooks/pdf/pdftohtml.py
index 4ac1d0e368..4aa0953738 100644
--- a/src/calibre/ebooks/pdf/pdftohtml.py
+++ b/src/calibre/ebooks/pdf/pdftohtml.py
@@ -13,7 +13,7 @@ from functools import partial
 
 from calibre.ebooks import ConversionError, DRMError
 from calibre.ptempfile import PersistentTemporaryFile
-from calibre import isosx, iswindows, islinux, isfreebsd
+from calibre.constants import isosx, iswindows, islinux, isfreebsd
 from calibre import CurrentDir
 
 PDFTOHTML = 'pdftohtml'
@@ -43,6 +43,8 @@ def pdftohtml(output_dir, pdf_path, no_images):
         # This is neccessary as pdftohtml doesn't always (linux) respect absolute paths
         pdf_path = os.path.abspath(pdf_path)
         cmd = [PDFTOHTML, '-enc', 'UTF-8', '-noframes', '-p', '-nomerge', '-nodrm', '-q', pdf_path, os.path.basename(index)]
+        if isfreebsd:
+            cmd.remove('-nodrm')
         if no_images:
             cmd.append('-i')
 
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 4e550de6ad..ddef5e1265 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -13,7 +13,7 @@ from PyQt4.Qt import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, \
 
 ORG_NAME = 'KovidsBrain'
 APP_UID  = 'libprs500'
-from calibre.constants import islinux, iswindows, isfreebsd, isfrozen
+from calibre.constants import islinux, iswindows, isfreebsd, isfrozen, isosx
 from calibre.utils.config import Config, ConfigProxy, dynamic, JSONConfig
 from calibre.utils.localization import set_qt_translator
 from calibre.ebooks.metadata.meta import get_metadata, metadata_from_formats
@@ -23,21 +23,45 @@ from calibre.utils.date import UNDEFINED_DATE
 # Setup gprefs {{{
 gprefs = JSONConfig('gui')
 
-gprefs.defaults['action-layout-toolbar'] = (
+if isosx:
+    gprefs.defaults['action-layout-menubar'] = (
+        'Add Books', 'Edit Metadata', 'Convert Books',
+        'Choose Library', 'Save To Disk', 'Preferences',
+        'Help',
+        )
+    gprefs.defaults['action-layout-menubar-device'] = (
+        'Add Books', 'Edit Metadata', 'Convert Books',
+        'Location Manager', 'Send To Device',
+        'Save To Disk', 'Preferences', 'Help',
+        )
+    gprefs.defaults['action-layout-toolbar'] = (
+        'Add Books', 'Edit Metadata', None, 'Convert Books', 'View', None,
+        'Choose Library', 'Donate', None, 'Fetch News', 'Save To Disk',
+        'Connect Share', None, 'Remove Books',
+        )
+    gprefs.defaults['action-layout-toolbar-device'] = (
+        'Add Books', 'Edit Metadata', None, 'Convert Books', 'View',
+        'Send To Device', None, None, 'Location Manager', None, None,
+        'Fetch News', 'Save To Disk', 'Connect Share', None,
+        'Remove Books',
+        )
+else:
+    gprefs.defaults['action-layout-menubar'] = ()
+    gprefs.defaults['action-layout-menubar-device'] = ()
+    gprefs.defaults['action-layout-toolbar'] = (
         'Add Books', 'Edit Metadata', None, 'Convert Books', 'View', None,
         'Choose Library', 'Donate', None, 'Fetch News', 'Save To Disk',
         'Connect Share', None, 'Remove Books', None, 'Help', 'Preferences',
         )
-
-gprefs.defaults['action-layout-toolbar-child'] = ()
-
-gprefs.defaults['action-layout-toolbar-device'] = (
+    gprefs.defaults['action-layout-toolbar-device'] = (
         'Add Books', 'Edit Metadata', None, 'Convert Books', 'View',
         'Send To Device', None, None, 'Location Manager', None, None,
         'Fetch News', 'Save To Disk', 'Connect Share', None,
         'Remove Books', None, 'Help', 'Preferences',
         )
 
+gprefs.defaults['action-layout-toolbar-child'] = ()
+
 gprefs.defaults['action-layout-context-menu'] = (
         'Edit Metadata', 'Send To Device', 'Save To Disk',
         'Connect Share', 'Copy To Library', None,
diff --git a/src/calibre/gui2/actions/__init__.py b/src/calibre/gui2/actions/__init__.py
index a68659864a..a5ef402f22 100644
--- a/src/calibre/gui2/actions/__init__.py
+++ b/src/calibre/gui2/actions/__init__.py
@@ -75,7 +75,7 @@ class InterfaceAction(QObject):
     dont_remove_from = frozenset([])
 
     all_locations = frozenset(['toolbar', 'toolbar-device', 'context-menu',
-        'context-menu-device', 'toolbar-child'])
+        'context-menu-device', 'toolbar-child', 'menubar', 'menubar-device'])
 
     #: Type of action
     #: 'current' means acts on the current view
diff --git a/src/calibre/gui2/actions/add_to_library.py b/src/calibre/gui2/actions/add_to_library.py
index fd686e3833..2665ffe0a4 100644
--- a/src/calibre/gui2/actions/add_to_library.py
+++ b/src/calibre/gui2/actions/add_to_library.py
@@ -12,7 +12,7 @@ class AddToLibraryAction(InterfaceAction):
     name = 'Add To Library'
     action_spec = (_('Add books to library'), 'add_book.png',
             _('Add books to your calibre library from the connected device'), None)
-    dont_add_to = frozenset(['toolbar', 'context-menu', 'toolbar-child'])
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
     action_type = 'current'
 
     def genesis(self):
diff --git a/src/calibre/gui2/actions/annotate.py b/src/calibre/gui2/actions/annotate.py
index a702ba045e..48397936fb 100644
--- a/src/calibre/gui2/actions/annotate.py
+++ b/src/calibre/gui2/actions/annotate.py
@@ -18,6 +18,7 @@ class FetchAnnotationsAction(InterfaceAction):
 
     name = 'Fetch Annotations'
     action_spec = (_('Fetch annotations (experimental)'), None, None, None)
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
     action_type = 'current'
 
     def genesis(self):
diff --git a/src/calibre/gui2/actions/catalog.py b/src/calibre/gui2/actions/catalog.py
index fadb140be6..fad6e59294 100644
--- a/src/calibre/gui2/actions/catalog.py
+++ b/src/calibre/gui2/actions/catalog.py
@@ -18,7 +18,7 @@ class GenerateCatalogAction(InterfaceAction):
 
     name = 'Generate Catalog'
     action_spec = (_('Create a catalog of the books in your calibre library'), None, None, None)
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
 
     def generate_catalog(self):
         rows = self.gui.library_view.selectionModel().selectedRows()
@@ -31,10 +31,10 @@ class GenerateCatalogAction(InterfaceAction):
                     _('No books selected for catalog generation'),
                     show=True)
 
-		db = self.gui.library_view.model().db
-		dbspec = {}
-		for id in ids:
-			dbspec[id] = {'ondevice': db.ondevice(id, index_is_id=True)}
+        db = self.gui.library_view.model().db
+        dbspec = {}
+        for id in ids:
+            dbspec[id] = {'ondevice': db.ondevice(id, index_is_id=True)}
 
         # Calling gui2.tools:generate_catalog()
         ret = generate_catalog(self.gui, dbspec, ids, self.gui.device_manager,
diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index fd7959a30e..4b262ad9dd 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -80,7 +80,7 @@ class ChooseLibraryAction(InterfaceAction):
     name = 'Choose Library'
     action_spec = (_('%d books'), 'lt.png',
             _('Choose calibre library to work with'), None)
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
 
     def genesis(self):
         self.count_changed(0)
@@ -210,7 +210,6 @@ class ChooseLibraryAction(InterfaceAction):
                 rename_actions, delete_actions, qs_actions,
                 self.action_choose)
 
-
     def location_selected(self, loc):
         enabled = loc == 'library'
         self.qaction.setEnabled(enabled)
diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py
index 36f420c7bb..ed0a064e88 100644
--- a/src/calibre/gui2/actions/convert.py
+++ b/src/calibre/gui2/actions/convert.py
@@ -20,7 +20,7 @@ class ConvertAction(InterfaceAction):
 
     name = 'Convert Books'
     action_spec = (_('Convert books'), 'convert.png', None, _('C'))
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):
diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py
index bfefbc5f64..64bc4e69d7 100644
--- a/src/calibre/gui2/actions/device.py
+++ b/src/calibre/gui2/actions/device.py
@@ -24,7 +24,7 @@ class ShareConnMenu(QMenu): # {{{
 
     config_email = pyqtSignal()
     toggle_server = pyqtSignal()
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
 
     def __init__(self, parent=None):
         QMenu.__init__(self, parent)
@@ -121,8 +121,7 @@ class SendToDeviceAction(InterfaceAction):
 
     name = 'Send To Device'
     action_spec = (_('Send to device'), 'sync.png', None, _('D'))
-    dont_remove_from = frozenset(['toolbar-device'])
-    dont_add_to = frozenset(['toolbar', 'context-menu', 'toolbar-child'])
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
 
     def genesis(self):
         self.qaction.triggered.connect(self.do_sync)
@@ -169,7 +168,7 @@ class ConnectShareAction(InterfaceAction):
 
     def toggle_content_server(self):
         if self.gui.content_server is None:
-           self.gui.start_content_server()
+            self.gui.start_content_server()
         else:
             self.gui.content_server.threaded_exit()
             self.stopping_msg = info_dialog(self.gui, _('Stopping'),
diff --git a/src/calibre/gui2/actions/edit_collections.py b/src/calibre/gui2/actions/edit_collections.py
index c64a3249d4..1a0b1038ce 100644
--- a/src/calibre/gui2/actions/edit_collections.py
+++ b/src/calibre/gui2/actions/edit_collections.py
@@ -12,7 +12,7 @@ class EditCollectionsAction(InterfaceAction):
     name = 'Edit Collections'
     action_spec = (_('Manage collections'), None,
             _('Manage the collections on this device'), None)
-    dont_add_to = frozenset(['toolbar', 'context-menu', 'toolbar-child'])
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
     action_type = 'current'
 
     def genesis(self):
diff --git a/src/calibre/gui2/actions/next_match.py b/src/calibre/gui2/actions/next_match.py
index 1c74719674..8e076655a9 100644
--- a/src/calibre/gui2/actions/next_match.py
+++ b/src/calibre/gui2/actions/next_match.py
@@ -11,7 +11,7 @@ class NextMatchAction(InterfaceAction):
     name = 'Move to next highlighted book'
     action_spec = (_('Move to next match'), 'arrow-down.png',
             _('Move to next highlighted match'), [_('N'), _('F3')])
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):
diff --git a/src/calibre/gui2/actions/open.py b/src/calibre/gui2/actions/open.py
index 141ff01a66..a66f68eee5 100644
--- a/src/calibre/gui2/actions/open.py
+++ b/src/calibre/gui2/actions/open.py
@@ -13,7 +13,7 @@ class OpenFolderAction(InterfaceAction):
     name = 'Open Folder'
     action_spec = (_('Open containing folder'), 'document_open.png', None,
             _('O'))
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):
diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py
index 6615f5c017..24d20b23f9 100644
--- a/src/calibre/gui2/actions/preferences.py
+++ b/src/calibre/gui2/actions/preferences.py
@@ -16,7 +16,6 @@ class PreferencesAction(InterfaceAction):
 
     name = 'Preferences'
     action_spec = (_('Preferences'), 'config.png', None, _('Ctrl+P'))
-    dont_remove_from = frozenset(['toolbar'])
 
     def genesis(self):
         pm = QMenu()
diff --git a/src/calibre/gui2/actions/show_book_details.py b/src/calibre/gui2/actions/show_book_details.py
index 67903a7d58..11064f2f39 100644
--- a/src/calibre/gui2/actions/show_book_details.py
+++ b/src/calibre/gui2/actions/show_book_details.py
@@ -15,7 +15,7 @@ class ShowBookDetailsAction(InterfaceAction):
     name = 'Show Book Details'
     action_spec = (_('Show book details'), 'dialog_information.png', None,
             _('I'))
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):
diff --git a/src/calibre/gui2/actions/tweak_epub.py b/src/calibre/gui2/actions/tweak_epub.py
index 212aff8019..c9f2d7a8c6 100755
--- a/src/calibre/gui2/actions/tweak_epub.py
+++ b/src/calibre/gui2/actions/tweak_epub.py
@@ -15,7 +15,7 @@ class TweakEpubAction(InterfaceAction):
     action_spec = (_('Tweak ePub'), 'trim.png',
             _('Make small changes to ePub format books'),
             _('T'))
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):
diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index 29c2cd4a7a..e102c35fbe 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -8,11 +8,11 @@ __docformat__ = 'restructuredtext en'
 from functools import partial
 
 from PyQt4.Qt import (QIcon, Qt, QWidget, QToolBar, QSize,
-    pyqtSignal, QToolButton, QMenu,
+    pyqtSignal, QToolButton, QMenu, QMenuBar, QAction,
     QObject, QVBoxLayout, QSizePolicy, QLabel, QHBoxLayout, QActionGroup)
 
 
-from calibre.constants import __appname__
+from calibre.constants import __appname__, isosx
 from calibre.gui2.search_box import SearchBox2, SavedSearchBox
 from calibre.gui2.throbber import ThrobbingButton
 from calibre.gui2 import gprefs
@@ -238,6 +238,80 @@ class Spacer(QWidget): # {{{
         self.l.addStretch(10)
 # }}}
 
+class MenuAction(QAction): # {{{
+
+    def __init__(self, clone, parent):
+        QAction.__init__(self, clone.text(), parent)
+        self.clone = clone
+        clone.changed.connect(self.clone_changed)
+
+    def clone_changed(self):
+        self.setText(self.clone.text())
+# }}}
+
+class MenuBar(QMenuBar): # {{{
+
+    def __init__(self, location_manager, parent):
+        QMenuBar.__init__(self, parent)
+        self.gui = parent
+        self.setNativeMenuBar(True)
+
+        self.location_manager = location_manager
+        self.location_manager.locations_changed.connect(self.build_bar)
+        self.added_actions = []
+
+        self.donate_action = QAction(_('Donate'), self)
+        self.donate_menu = QMenu()
+        self.donate_menu.addAction(self.gui.donate_action)
+        self.donate_action.setMenu(self.donate_menu)
+        self.build_bar()
+
+    def build_bar(self, changed_action=None):
+        showing_device = self.location_manager.has_device
+        actions = '-device' if showing_device else ''
+        actions = gprefs['action-layout-menubar'+actions]
+
+        show_main = len(actions) > 0
+        self.setVisible(show_main)
+
+        for ac in self.added_actions:
+            m = ac.menu()
+            if m is not None:
+                m.setVisible(False)
+
+        self.clear()
+        self.added_actions = []
+        self.action_map = {}
+
+        for what in actions:
+            if what is None:
+                continue
+            elif what == 'Location Manager':
+                for ac in self.location_manager.available_actions:
+                    ac = self.build_menu(ac)
+                    self.addAction(ac)
+                    self.added_actions.append(ac)
+            elif what == 'Donate':
+                self.addAction(self.donate_action)
+            elif what in self.gui.iactions:
+                action = self.gui.iactions[what]
+                ac = self.build_menu(action.qaction)
+                self.addAction(ac)
+                self.added_actions.append(ac)
+
+    def build_menu(self, action):
+        m = action.menu()
+        ac = MenuAction(action, self)
+        if m is None:
+            m = QMenu()
+            m.addAction(action)
+        ac.setMenu(m)
+        return ac
+
+
+
+# }}}
+
 class ToolBar(QToolBar): # {{{
 
     def __init__(self, donate, location_manager, child_bar, parent):
@@ -284,6 +358,8 @@ class ToolBar(QToolBar): # {{{
         mactions = gprefs['action-layout-toolbar'+mactions]
         cactions = gprefs['action-layout-toolbar-child']
 
+        show_main = len(mactions) > 0
+        self.setVisible(show_main)
         show_child = len(cactions) > 0
         self.child_bar.setVisible(show_child)
 
@@ -309,6 +385,8 @@ class ToolBar(QToolBar): # {{{
                     self.d_widget = QWidget()
                     self.d_widget.setLayout(QVBoxLayout())
                     self.d_widget.layout().addWidget(self.donate_button)
+                    if isosx:
+                        self.d_widget.setStyleSheet('QWidget, QToolButton {background-color: none; border: none; }')
                     bar.addWidget(self.d_widget)
                     self.showing_donate = True
                 elif what in self.gui.iactions:
@@ -325,17 +403,20 @@ class ToolBar(QToolBar): # {{{
         ch.setAutoRaise(True)
         if ac.menu() is not None and menu_mode is not None:
             ch.setPopupMode(menu_mode)
+        return ch
 
     def resizeEvent(self, ev):
         QToolBar.resizeEvent(self, ev)
         style = Qt.ToolButtonTextUnderIcon
-        p = gprefs['toolbar_text']
-        if p == 'never':
-            style = Qt.ToolButtonIconOnly
+        s = gprefs['toolbar_icon_size']
+        if s != 'off':
+            p = gprefs['toolbar_text']
+            if p == 'never':
+                style = Qt.ToolButtonIconOnly
 
-        if p == 'auto' and self.preferred_width > self.width()+35 and \
-                not gprefs['action-layout-toolbar-child']:
-            style = Qt.ToolButtonIconOnly
+            if p == 'auto' and self.preferred_width > self.width()+35 and \
+                    not gprefs['action-layout-toolbar-child']:
+                style = Qt.ToolButtonIconOnly
 
         self.setToolButtonStyle(style)
 
@@ -421,6 +502,9 @@ class MainWindowMixin(object): # {{{
                 self.location_manager, self.child_bar, self)
         self.addToolBar(Qt.TopToolBarArea, self.tool_bar)
         self.addToolBar(Qt.BottomToolBarArea, self.child_bar)
+        self.menu_bar = MenuBar(self.location_manager, self)
+        self.setMenuBar(self.menu_bar)
+        self.setUnifiedTitleAndToolBarOnMac(True)
 
         l = self.centralwidget.layout()
         l.addWidget(self.search_bar)
diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
index 176c164d3d..7fa052844f 100644
--- a/src/calibre/gui2/metadata/single_download.py
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -398,12 +398,24 @@ class IdentifyWidget(QWidget): # {{{
         self.abort.set()
 # }}}
 
-class FullFetch(QDialog): # {{{
+class CoverWidget(QWidget): # {{{
 
     def __init__(self, log, parent=None):
-        QDialog.__init__(self, parent)
+        QWidget.__init__(self, parent)
         self.log = log
 
+    def start(self, book, current_cover, title, authors):
+        self.book, self.current_cover = book, current_cover
+        self.title, self.authors = title, authors
+        self.log('\n\nStarting cover download for:', book.title)
+# }}}
+
+class FullFetch(QDialog): # {{{
+
+    def __init__(self, log, current_cover=None, parent=None):
+        QDialog.__init__(self, parent)
+        self.log, self.current_cover = log, current_cover
+
         self.setWindowTitle(_('Downloading metadata...'))
         self.setWindowIcon(QIcon(I('metadata.png')))
 
@@ -428,12 +440,19 @@ class FullFetch(QDialog): # {{{
         self.identify_widget.results_found.connect(self.identify_results_found)
         self.identify_widget.book_selected.connect(self.book_selected)
         self.stack.addWidget(self.identify_widget)
+
+        self.cover_widget = CoverWidget(self.log, parent=self)
+        self.stack.addWidget(self.cover_widget)
+
         self.resize(850, 500)
 
     def book_selected(self, book):
-        print (book)
         self.next_button.setVisible(False)
         self.ok_button.setVisible(True)
+        self.book = book
+        self.stack.setCurrentIndex(1)
+        self.cover_widget.start(book, self.current_cover,
+                self.title, self.authors)
 
     def accept(self):
         # Prevent the usual dialog accept mechanisms from working
@@ -453,6 +472,7 @@ class FullFetch(QDialog): # {{{
         pass
 
     def start(self, title=None, authors=None, identifiers={}):
+        self.title, self.authors = title, authors
         self.identify_widget.start(title=title, authors=authors,
                 identifiers=identifiers)
         self.exec_()
diff --git a/src/calibre/gui2/preferences/columns.ui b/src/calibre/gui2/preferences/columns.ui
index 685a5ab847..48944b1c04 100644
--- a/src/calibre/gui2/preferences/columns.ui
+++ b/src/calibre/gui2/preferences/columns.ui
@@ -218,7 +218,7 @@
         <item row="0" column="1">
          <widget class="QComboBox" name="opt_edit_metadata_single_layout">
           <property name="toolTip">
-           <string>Choose varying layouts in the Edit Metadata Single dialog.</string>
+           <string>Choose a different layout for the Edit Metadata dialog. Alternate layouts make it easier to edit custom columns.</string>
           </property>
          </widget>
         </item>
diff --git a/src/calibre/gui2/preferences/main.py b/src/calibre/gui2/preferences/main.py
index d930fb3ebd..9f26bea7ce 100644
--- a/src/calibre/gui2/preferences/main.py
+++ b/src/calibre/gui2/preferences/main.py
@@ -360,6 +360,7 @@ class Preferences(QMainWindow):
             self.gui.create_device_menu()
             self.gui.set_device_menu_items_state(bool(self.gui.device_connected))
             self.gui.tool_bar.build_bar()
+            self.gui.menu_bar.build_bar()
             self.gui.build_context_menus()
             self.gui.tool_bar.apply_settings()
 
diff --git a/src/calibre/gui2/preferences/toolbar.py b/src/calibre/gui2/preferences/toolbar.py
index 93079110a5..7f5e0c4441 100644
--- a/src/calibre/gui2/preferences/toolbar.py
+++ b/src/calibre/gui2/preferences/toolbar.py
@@ -34,9 +34,12 @@ class BaseModel(QAbstractListModel):
         if name == 'Location Manager':
             return FakeAction(name, None,
                     _('Switch between library and device views'),
-                    dont_remove_from=set(['toolbar-device']))
+                    dont_add_to=frozenset(['menubar', 'toolbar',
+                        'toolbar-child', 'context-menu',
+                        'context-menu-device']))
         if name is None:
-            return FakeAction('--- '+_('Separator')+' ---', None)
+            return FakeAction('--- '+_('Separator')+' ---', None,
+                    dont_add_to=frozenset(['menubar', 'menubar-device']))
         try:
             return gui.iactions[name]
         except:
@@ -77,6 +80,12 @@ class BaseModel(QAbstractListModel):
             ans.append(n)
         return ans
 
+    def has_action(self, name):
+        for a in self._data:
+            if a.name == name:
+                return True
+        return False
+
 
 class AllModel(BaseModel):
 
@@ -89,7 +98,7 @@ class AllModel(BaseModel):
         self._data = self.get_all_actions(current)
 
     def get_all_actions(self, current):
-        all = list(self.gui.iactions.keys()) + ['Donate']
+        all = list(self.gui.iactions.keys()) + ['Donate', 'Location Manager']
         all = [x for x in all if x not in current] + [None]
         all = [self.name_to_action(x, self.gui) for x in all]
         all = [x for x in all if self.key not in x.dont_add_to]
@@ -208,12 +217,14 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     LOCATIONS = [
             ('toolbar', _('The main toolbar')),
-            ('toolbar-child', _('The optional second toolbar')),
             ('toolbar-device', _('The main toolbar when a device is connected')),
+            ('toolbar-child', _('The optional second toolbar')),
+            ('menubar', _('The menubar')),
+            ('menubar-device', _('The menubar when a device is connected')),
             ('context-menu', _('The context menu for the books in the '
                 'calibre library')),
             ('context-menu-device', _('The context menu for the books on '
-                'the device'))
+                'the device')),
             ]
 
     def genesis(self, gui):
@@ -284,6 +295,18 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
                 self.changed_signal.emit()
 
     def commit(self):
+        # Ensure preferences are showing in either the toolbar or
+        # the menubar.
+        pref_in_toolbar = self.models['toolbar'][1].has_action('Preferences')
+        pref_in_menubar = self.models['menubar'][1].has_action('Preferences')
+        lm_in_toolbar = self.models['toolbar-device'][1].has_action('Location Manager')
+        lm_in_menubar = self.models['menubar-device'][1].has_action('Location Manager')
+        if not pref_in_toolbar and not pref_in_menubar:
+            self.models['menubar'][1].add(['Preferences'])
+        if not lm_in_toolbar and not lm_in_menubar:
+            self.models['menubar-device'][1].add(['Location Manager'])
+
+        # Save data.
         for am, cm in self.models.values():
             cm.commit()
         return False
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index a0aa0138bc..8b2beedfd4 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -153,6 +153,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
 
         for ac in self.iactions.values():
             ac.do_genesis()
+        self.donate_action = QAction(QIcon(I('donate.png')), _('&Donate to support calibre'), self)
         MainWindowMixin.__init__(self, db)
 
         # Jobs Button {{{
@@ -186,8 +187,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
         self.system_tray_menu = QMenu(self)
         self.restore_action = self.system_tray_menu.addAction(
                 QIcon(I('page.png')), _('&Restore'))
-        self.donate_action  = self.system_tray_menu.addAction(
-                QIcon(I('donate.png')), _('&Donate to support calibre'))
+        self.system_tray_menu.addAction(self.donate_action)
         self.donate_button.setDefaultAction(self.donate_action)
         self.donate_button.setStatusTip(self.donate_button.toolTip())
         self.eject_action = self.system_tray_menu.addAction(
diff --git a/src/calibre/manual/creating_plugins.rst b/src/calibre/manual/creating_plugins.rst
index dd62e4e416..3b6b9611af 100644
--- a/src/calibre/manual/creating_plugins.rst
+++ b/src/calibre/manual/creating_plugins.rst
@@ -197,7 +197,7 @@ Once you've located the zip file of your plugin you can then directly update it
 
     zip -R /path/to/plugin/zip/file.zip *
 
-This will automatically update all changed files. It relies on the freely available zip command line tool.
+This will update all changed files. It relies on the freely available zip command line tool. Note that you should quit calibre before running this command.
 
 More plugin examples
 ----------------------
diff --git a/src/calibre/translations/af.po b/src/calibre/translations/af.po
index 8faa35bce1..eec10ba1ca 100644
--- a/src/calibre/translations/af.po
+++ b/src/calibre/translations/af.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2009-11-06 19:11+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Afrikaans <af@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: 2011-03-27 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:40+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Doen absolute niks"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Doen absolute niks"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Doen absolute niks"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Doen absolute niks"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Doen absolute niks"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Doen absolute niks"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Doen absolute niks"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Doen absolute niks"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Basis"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Lêertipe"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadata leeser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadata skrywer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -330,7 +330,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -649,35 +649,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -685,29 +681,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -729,106 +725,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -872,20 +880,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -893,8 +901,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -904,8 +912,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -913,17 +921,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1222,32 +1230,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1256,29 +1264,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1411,7 +1430,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2048,7 +2067,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2163,7 +2182,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2174,6 +2193,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2523,105 +2546,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3004,7 +3027,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3137,7 +3160,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3303,6 +3326,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3567,135 +3591,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3903,8 +3931,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4101,7 +4129,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4167,7 +4195,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4175,7 +4203,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4356,7 +4384,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4364,32 +4392,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4476,26 +4504,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4503,7 +4531,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4515,7 +4543,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4526,19 +4554,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4603,7 +4631,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4845,7 +4873,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5047,8 +5075,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5058,17 +5086,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5078,25 +5106,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5154,7 +5182,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5177,14 +5205,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5749,10 +5777,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6344,7 +6376,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6929,97 +6961,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7305,7 +7337,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7441,7 +7473,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7488,8 +7520,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7521,12 +7553,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7710,22 +7742,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9205,12 +9237,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9279,7 +9311,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9514,61 +9546,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9582,67 +9614,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9850,48 +9900,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9966,7 +10016,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9983,12 +10033,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10794,25 +10844,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10824,91 +10881,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10917,22 +10974,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10942,64 +10999,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11730,30 +11783,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11850,7 +11907,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11943,166 +12000,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12112,60 +12169,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12238,34 +12295,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12465,7 +12522,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12543,36 +12600,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12648,73 +12705,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12789,27 +12846,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13975,11 +14032,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13993,15 +14050,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15038,101 +15095,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/ar.po b/src/calibre/translations/ar.po
index 7b88cb311f..97e245ef4f 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: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-01-03 01:54+0000\n"
 "Last-Translator: Amr Hesham <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: 2011-03-27 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:40+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
@@ -29,7 +29,7 @@ msgstr ""
 msgid "The monospace family of fonts to embed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
@@ -73,11 +73,11 @@ msgstr ""
 msgid "The monospaced font size in px"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "لا يفعل شيءً"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -88,7 +88,7 @@ msgstr "لا يفعل شيءً"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -105,9 +105,9 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -127,7 +127,7 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -173,19 +173,19 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -193,12 +193,12 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -209,11 +209,11 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -227,46 +227,46 @@ msgstr "لا يفعل شيءً"
 msgid "Unknown"
 msgstr "مجهول"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "قاعدة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "نوع الملف"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "قارئ دليل المعلومات"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "كاتب دليل المعلومات"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "واجهة المستخدم"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "التفضيلات"
@@ -388,8 +388,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "خصِّص شريط الأدوات"
+msgid "Toolbar"
+msgstr "شريط الأدوات"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -398,7 +398,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -720,35 +720,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "ملحقات مثبتة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "تعيين لملحقات أنواع الملفات"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "تخصيص الملحقات المحلية"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "ملحقات معطلة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "تفعيل الاضافات"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "لا يجد ملحق صالح "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "فشل استهلال الملحق %s مع اقتفاء الأثر:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -760,29 +756,29 @@ msgstr ""
 "    المقدرة على التخصيص بتحميل الملحقات الخارجية .\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "حذف الملحق المخصص عن طريق اسمه. لا يؤثر على الملحقات المضمنة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "تخصيص الملحق . حدد اسم الملحق وسلسلة التخصيص وفرقهما بفاصلة."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "قائمة كل الملحقات المثبتة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "تمكين الملحق المسمى"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "تعطيل الملحق المسمى"
 
@@ -804,106 +800,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "تواصل معا هواتف S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "جهاز أبل"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "التواصل عن طريق iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "تم الكشف عن جهاز ابل, يتم تشغيل iTunes, الرجاء الانتظار..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d من %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "تم"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "الأخبار"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "الفهرس"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "تواصل معا iTunes"
 
@@ -947,20 +955,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "يجري إحصاء قائمة كتب من الجهاز..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "يجري تحويل الكتب إلى الجهاز..."
 
@@ -968,8 +976,8 @@ msgstr "يجري تحويل الكتب إلى الجهاز..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "إضافة كتب لقائمة البيانات الوصفية للجهاز ..."
 
@@ -979,8 +987,8 @@ msgstr "إضافة كتب لقائمة البيانات الوصفية للجه
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "يجري حذف الكتب من الجهاز..."
 
@@ -988,17 +996,17 @@ msgstr "يجري حذف الكتب من الجهاز..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "يجري إرسال دليل المعلومات. إلى الجهاز..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1297,15 +1305,15 @@ msgstr "التواصل مع قارئ الكتاب الاليكتروني سون
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1313,18 +1321,18 @@ msgstr ""
 "ضع علامة الفاصلة للفصل بين مجموعة من البيانات الوصفية لكي تكون مجموعة في "
 "الجهاز . و تشمل الاحتمالات التالية: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1333,29 +1341,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1488,7 +1507,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr "الاتصال مع جهاز قارئ إلكتروني ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "يجري إحصاء معلومات الجهاز..."
 
@@ -2142,7 +2161,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2257,7 +2276,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2268,6 +2287,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2618,105 +2641,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "العنوان"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "المؤلف أو المؤلفون"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "الناشر"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "المنتج"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "التعليقات"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "الوسوم"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "السلسلة"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "اللغة"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "ختم التوقيت"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3099,7 +3122,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3232,7 +3255,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3398,6 +3421,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3662,135 +3686,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "تأكيد قبل الحذف"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Notify when a new version is available"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "الإفتراضي للتحويل إلى LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "الخيارات لمستعرض كتب LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "تهيئات التي تعرض عن طريق المستعرض الداخلي"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "إظهار أيقونة صينية النظام"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "رفع أخبار تم تنزيلها إلى الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "حذف كتب من المكتبة بعد رفعها إلى الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3998,8 +4026,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4196,7 +4224,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4262,7 +4290,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "لا يمكن تحويله"
 
@@ -4270,7 +4298,7 @@ msgstr "لا يمكن تحويله"
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4451,7 +4479,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4459,32 +4487,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "إرسال لجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4571,26 +4599,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "لا يمكن تحرير الميتاداتا"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4598,7 +4626,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4610,7 +4638,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4621,19 +4649,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "احصل على الأخبار"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4698,7 +4726,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4940,7 +4968,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5142,8 +5170,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "المسار"
 
@@ -5153,17 +5181,17 @@ msgstr "المسار"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "التهيئات"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5173,25 +5201,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "بدون"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5249,7 +5277,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5272,14 +5300,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5844,10 +5872,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6441,7 +6473,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "تجربة"
 
@@ -7026,97 +7058,97 @@ msgstr "خطأ"
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "خطأ في الاتصال بالجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "الجهاز: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " تم كشفه."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7402,7 +7434,7 @@ msgstr "إختيار التهيئة"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "التهيئة"
 
@@ -7538,7 +7570,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7585,8 +7617,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7618,12 +7650,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7807,22 +7839,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9306,12 +9338,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9380,7 +9412,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&تجربة"
 
@@ -9615,61 +9647,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9683,67 +9715,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "اسم ال&ملف:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ":العنوان"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "المؤلفون:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "السلسلة:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "فهرس السلسلة:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regular expression (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9951,44 +10001,44 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10063,7 +10113,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10080,12 +10130,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "الصفحة التالية"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "الصفحة السابقة"
 
@@ -10891,25 +10941,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10921,91 +10978,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "متوسط"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "صغير"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "كبير"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "إختر ال&لغة (يحتاج إعادة تشغيل):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11014,22 +11071,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11039,64 +11096,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11827,30 +11880,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11947,7 +12004,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "بحث"
@@ -12040,166 +12097,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12209,60 +12266,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12335,34 +12392,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "خطأ في التحويل"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12542,7 +12599,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12600,36 +12657,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12705,73 +12762,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "إختيار الكتاب الإلكتروني"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "كتب إلكترونية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "يتم تحميل الكتاب الإلكتروني..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "لم يتمكن من فتح الكتاب الإلكتروني"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12846,27 +12903,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14035,11 +14092,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14053,15 +14110,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15098,101 +15155,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "تم التنزيل"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "فشل تنزيل المقالات التالية:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "فشل تنزيل أجزاء من المقالات التالية:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " من "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "محاولة تنزيل الغلاف..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "تم تنزيل التلقيم إلى %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "لم يتمكّن من تنزيل الغلاف: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "يتم تنزيل الغلاف من %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "مقالة بدون عنوان"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "المقالة منزّلة: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "فشل تنزيل المقالة: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15436,6 +15493,9 @@ msgstr ""
 #~ msgid "Italian"
 #~ msgstr "إيطالي"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "لا يجد ملحق صالح "
+
 #~ msgid "The reader has no storage card connected."
 #~ msgstr "ليس للقارئ بطاقة تخزين."
 
@@ -15738,9 +15798,6 @@ msgstr ""
 #~ msgid "<br>Must be a directory."
 #~ msgstr "<br>يجب أن يكون دليل."
 
-#~ msgid "Toolbar"
-#~ msgstr "شريط الأدوات"
-
 #~ msgid "&Metadata from file name"
 #~ msgstr "&ميتاداتا من اسم الملف"
 
@@ -16009,3 +16066,6 @@ msgstr ""
 
 #~ msgid "  "
 #~ msgstr "  "
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "خصِّص شريط الأدوات"
diff --git a/src/calibre/translations/ast.po b/src/calibre/translations/ast.po
index 77a2d19163..8635a20165 100644
--- a/src/calibre/translations/ast.po
+++ b/src/calibre/translations/ast.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-01-31 21:37+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Asturian <ast@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: 2011-03-27 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:40+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr ""
 msgid "Unknown"
 msgstr "Desconocío"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Formatu de ficheru"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Xenerador de catálogu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -330,7 +330,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -649,35 +649,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -685,29 +681,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -729,106 +725,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -872,20 +880,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -893,8 +901,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -904,8 +912,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -913,17 +921,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1222,32 +1230,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1256,29 +1264,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1411,7 +1430,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2048,7 +2067,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2163,7 +2182,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2174,6 +2193,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2523,105 +2546,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3004,7 +3027,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3137,7 +3160,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3303,6 +3326,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3567,135 +3591,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3903,8 +3931,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4101,7 +4129,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4167,7 +4195,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4175,7 +4203,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4356,7 +4384,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4364,32 +4392,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4476,26 +4504,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4503,7 +4531,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4515,7 +4543,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4526,19 +4554,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4603,7 +4631,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4845,7 +4873,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5047,8 +5075,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5058,17 +5086,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5078,25 +5106,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5154,7 +5182,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5177,14 +5205,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5749,10 +5777,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6344,7 +6376,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6929,97 +6961,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7305,7 +7337,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7441,7 +7473,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7488,8 +7520,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7521,12 +7553,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7710,22 +7742,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9205,12 +9237,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9279,7 +9311,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9514,61 +9546,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9582,67 +9614,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9850,48 +9900,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9966,7 +10016,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9983,12 +10033,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10794,25 +10844,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10824,91 +10881,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10917,22 +10974,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10942,64 +10999,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11730,30 +11783,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11850,7 +11907,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11943,166 +12000,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12112,60 +12169,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12238,34 +12295,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12465,7 +12522,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12543,36 +12600,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12648,73 +12705,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12789,27 +12846,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13975,11 +14032,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13993,15 +14050,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15038,101 +15095,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/bg.po b/src/calibre/translations/bg.po
index 4b7de4cbe8..645388909e 100644
--- a/src/calibre/translations/bg.po
+++ b/src/calibre/translations/bg.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-30 01:18+0000\n"
 "Last-Translator: Yassen Nikolov <Unknown>\n"
 "Language-Team: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-31 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:41+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Не прави абсолютно нищо"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Не прави абсолютно нищо"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Не прави абсолютно нищо"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Не прави абсолютно нищо"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Не прави абсолютно нищо"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Не прави абсолютно нищо"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Не прави абсолютно нищо"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Не прави абсолютно нищо"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Основен"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Тип на файла"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Четене на метаданни"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Запис на метаданни"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Генериране на каталог"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Дейстия от потребителския интерфейс"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Предпочитания"
@@ -335,8 +335,8 @@ msgstr ""
 "Добавете/премахнете свои собствени колони в списъка с книги на calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Настройки на лентата с инструменти"
+msgid "Toolbar"
+msgstr "Лента с инструменти"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -347,7 +347,7 @@ msgstr ""
 "действия да бъдат на разположение в тях"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -671,35 +671,31 @@ msgstr "Този профил е предназначен за B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Този профил е предназначен за Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Инсталирани добавки"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Съответствия за плъгини за вида файл"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Настройка на локалните добавки"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Изключени добавки"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Включени добавки"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Не са намерени валидни добавки в "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -707,29 +703,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Списък на всички инсталирани добавки"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Активиране на избраната добавка"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Деактивиране на избраната добавка"
 
@@ -751,107 +747,119 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Комуникирай със S60 устройства"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Кеширай обложки от iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr "Разреши кеширане и показване на обложки от iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple устройство"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Комуникирай с iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "Apple устройство разпознато, стартиране на iTunes, моля изчакайте ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d от %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "завършено"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Новини"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Каталог"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -895,20 +903,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -916,8 +924,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -927,8 +935,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -936,17 +944,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1245,32 +1253,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1279,29 +1287,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1434,7 +1453,7 @@ msgstr "Допълнително персонализиране"
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2073,7 +2092,7 @@ msgstr "Конвертиране на входните данни в HTML ..."
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Създаване"
 
@@ -2188,7 +2207,7 @@ msgstr "Начало"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2199,6 +2218,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2548,105 +2571,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Не"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Да"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Заглавие"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Автор(и)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Издател"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Производител"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Коментари"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Етикети"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Серии"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Език"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Публикувана"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Права"
 
@@ -3029,7 +3052,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3162,7 +3185,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3328,6 +3351,7 @@ msgid "Author"
 msgstr "Автор"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Тема"
 
@@ -3592,135 +3616,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Показване на икона в системния панел"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Избор на файлове"
 
@@ -3928,8 +3956,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Не са избрани книги"
@@ -4126,7 +4154,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4192,7 +4220,7 @@ msgid "Bulk convert"
 msgstr "Масово конвертиране"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Не може да се конвертира"
 
@@ -4200,7 +4228,7 @@ msgstr "Не може да се конвертира"
 msgid "Starting conversion of %d book(s)"
 msgstr "Започване на конвертиране на %d книга(и)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4381,7 +4409,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Имейл до"
 
@@ -4389,32 +4417,32 @@ msgstr "Имейл до"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Изпращене към устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4501,26 +4529,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Не може да се редактират метаданните"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4528,7 +4556,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4540,7 +4568,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4551,19 +4579,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4628,7 +4656,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Стартиране на началния съветник"
 
@@ -4870,7 +4898,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Няма книги"
 
@@ -5072,8 +5100,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Път"
 
@@ -5083,17 +5111,17 @@ msgstr "Път"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Формати"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Колекции"
 
@@ -5103,25 +5131,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5179,7 +5207,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5202,14 +5230,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5774,10 +5802,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6369,7 +6401,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Тестване"
 
@@ -6954,97 +6986,97 @@ msgstr "Грешка"
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Няма подходящи формати"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Устройство: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Няма устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Няма карта"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Няма място на устройството"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7330,7 +7362,7 @@ msgstr "Избор на формат"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Формат"
 
@@ -7466,7 +7498,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7513,8 +7545,8 @@ msgid "Location"
 msgstr "Местоположение"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7546,12 +7578,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7735,22 +7767,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Малки букви"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Главни букви"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9233,12 +9265,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9307,7 +9339,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "Про&ба"
 
@@ -9542,61 +9574,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Новини:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "от"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "в %s формат."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Изпращане на имейл на"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9610,67 +9642,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "&Регулярен израз"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Заглавие:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Няма съвпадение"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Автори:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9878,48 +9928,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Размер (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9994,7 +10044,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Не са намерени съвпадения"
 
@@ -10011,12 +10061,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Следваща страница"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Предишна страница"
 
@@ -10822,25 +10872,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10852,91 +10909,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Среден"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Малък"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Голям"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10945,22 +11002,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10970,64 +11027,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11762,30 +11815,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11882,7 +11939,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Търсене"
@@ -11975,166 +12032,166 @@ msgstr "Щракнете, за да промените"
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12144,60 +12201,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12270,34 +12327,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12497,7 +12554,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12575,36 +12632,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12680,73 +12737,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12821,27 +12878,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14007,11 +14064,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14025,15 +14082,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15070,101 +15127,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15289,9 +15346,6 @@ msgstr ""
 #~ msgid "~"
 #~ msgstr "~"
 
-#~ msgid "Toolbar"
-#~ msgstr "Лента с инструменти"
-
 #~ msgid "&Button size in toolbar"
 #~ msgstr "Размер на &бутоните в лентата с инструменти"
 
@@ -15364,8 +15418,14 @@ msgstr ""
 #~ msgid "use comma"
 #~ msgstr "използване на запетая"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Не са намерени валидни добавки в "
+
 #~ msgid "Last downloaded"
 #~ msgstr "Последно свалено"
 
 #~ msgid "Download covers from librarything.com"
 #~ msgstr "Сваляне на корица от librarything.com"
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Настройки на лентата с инструменти"
diff --git a/src/calibre/translations/bn.po b/src/calibre/translations/bn.po
index e660bd5f92..c7d2da5701 100644
--- a/src/calibre/translations/bn.po
+++ b/src/calibre/translations/bn.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-12-11 02:29+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Bengali <bn@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: 2011-03-27 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:41+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "আসলে কিছুই করে না"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "আসলে কিছুই করে না"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "আসলে কিছুই করে না"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "আসলে কিছুই করে না"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "আসলে কিছুই করে না"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "আসলে কিছুই করে না"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "আসলে কিছুই করে না"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "আসলে কিছুই করে না"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "ভিত্তি"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "ফাইলের ধরণ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "মেটাডাটা পাঠক"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "মেটাডাটা লেখক"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "ক্যাটালগ জেনারেটর"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "পছন্দসমূহ"
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/bs.po b/src/calibre/translations/bs.po
index 5507d1a30f..17d985d41a 100644
--- a/src/calibre/translations/bs.po
+++ b/src/calibre/translations/bs.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-01-18 21:03+0000\n"
 "Last-Translator: Senad Sopovic <Unknown>\n"
 "Language-Team: Bosnian <bs@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: 2011-03-27 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:41+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Radi apsolutno ništa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Radi apsolutno ništa"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Radi apsolutno ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Radi apsolutno ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Radi apsolutno ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Radi apsolutno ništa"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Radi apsolutno ništa"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Radi apsolutno ništa"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Baza"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Prilagoditi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "tip datoteke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metapodaci čitač"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalog proizvođač"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Korisničko sučelje Akcija"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Podešavanja"
@@ -325,8 +325,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Prilagodi traku s alatima"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple uređah"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "završeno"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Vijesti"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Uklanjam knjige sa uređaja..."
 
@@ -908,17 +916,17 @@ msgstr "Uklanjam knjige sa uređaja..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15236,3 +15293,6 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid "Do not download CSS stylesheets."
 msgstr ""
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Prilagodi traku s alatima"
diff --git a/src/calibre/translations/ca.po b/src/calibre/translations/ca.po
index edff333113..06a9f7b3ef 100644
--- a/src/calibre/translations/ca.po
+++ b/src/calibre/translations/ca.po
@@ -10,21 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-25 20:47+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-01 20:05+0000\n"
 "Last-Translator: FerranRius <frius64@hotmail.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: 2011-03-27 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:42+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "No fa res"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -35,7 +35,7 @@ msgstr "No fa res"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -52,9 +52,9 @@ msgstr "No fa res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -74,7 +74,7 @@ msgstr "No fa res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -120,19 +120,19 @@ msgstr "No fa res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -140,12 +140,12 @@ msgstr "No fa res"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -156,11 +156,11 @@ msgstr "No fa res"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -174,46 +174,46 @@ msgstr "No fa res"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personalitza"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "No es pot configurar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tipus de fitxer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Lector de metadades"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Editor de metadades"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generador del catàleg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Acció d'interfície d'usuari"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferències"
@@ -340,8 +340,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Configura les columnes de la llista de llibres del calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Personalitza la barra d'eines"
+msgid "Toolbar"
+msgstr "Barra d'eines"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -352,8 +352,8 @@ msgstr ""
 "que estaran disponibles"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Personalitza les cerques"
+msgid "Searching"
+msgstr "S'està cercant"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -695,35 +695,31 @@ msgstr "Aquest perfil és adient per al B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Aquest perfil és adient per al Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Connectors instal·lats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Associació per a connectors de tipus de fitxers"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Personalització del connector local"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Connectors inhabilitats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Connectors habilitats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-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:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -735,17 +731,17 @@ msgstr ""
 "    Personalitzeu el calibre carregant connectors externs.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Afegeix un connector especificant el camí a l'arxiu ZIP que el conté"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -753,15 +749,15 @@ msgstr ""
 "Personalitza el connector. Especifiqueu el nom del connector i la cadena de "
 "personalització, separats per una coma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Mostra una llista dels connectors instal·lats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Habilita el connector anomenat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Inhabilita el connector anomenat"
 
@@ -785,48 +781,70 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunica't amb telèfons S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+"<p>Si no voleu que el calibre reconegui el vostre dispositiu Apple quan es "
+"connecti a l'ordinador feu clic a <b>«Inhabilita el controlador "
+"Apple»</b>.</p><p>Per transferir llibres al dispositiu Apple feu clic a "
+"<b>«Inhabilita el controlador Apple»</b> i utilitzeu el mètode «Connecta a "
+"iTunes» que es recomana a <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, utilitzant l'element del menú "
+"<em>Connecta/comparteix</em>|<em>Connecta a iTunes</em>.</p><p>Habilitar el "
+"controlador Apple per a una connexió directa als dispositius Apple és un "
+"mode d'usuari avançat per al qual no hi ha suport.</p><p></p>"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr "Inhabilita el controlador Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr "Habilita el controlador Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Fes servir la sèrie com a categoria a l'iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 "Habilita la utilització del nom de la sèrie com a gènere d'iTunes, categoria "
 "d'iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Memòria cau de portades de l'iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 "Habilita que les portades d'iTunes/iBooks es visualitzin i es desin a la "
 "memòria cau"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr "Omet la recomanació «Connecta a iTunes»"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr "Habilita l'omissió del quadre de recomanació «Connecta a iTunes»"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Dispositiu Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Comunica't amb iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "S'ha detectat un dispositiu Apple, s'està engegant l'iTunes, espereu ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -835,27 +853,27 @@ msgstr ""
 "los des de la biblioteca de l'iTunes a l'escriptori i després afegiu-los a "
 "la finestra de la biblioteca del calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "S'està actualitzant el llistat de metadades del dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "s'ha acabat"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -865,7 +883,7 @@ msgstr ""
 "Suprimiu-los amb l'aplicació de l'iBooks.\n"
 "Feu clic a «Mostra detalls» per a la llista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -873,31 +891,31 @@ msgstr ""
 "No s'ha pogut convertir algunes portades.\n"
 "Feu clic a «Mostra detalls» per a la llista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Notícies"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catàleg"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Comunica't amb l'iTunes"
 
@@ -949,20 +967,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "S'està aconseguint la llista de llibres del dispositiu..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "S'està transferint llibres al dispositiu..."
 
@@ -970,8 +988,8 @@ msgstr "S'està transferint llibres al dispositiu..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "S'està afegint llibres al llistat de metadades del dispositiu..."
 
@@ -981,8 +999,8 @@ msgstr "S'està afegint llibres al llistat de metadades del dispositiu..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "S'estan suprimint  els llibres del dispositiu..."
 
@@ -990,17 +1008,17 @@ msgstr "S'estan suprimint  els llibres del dispositiu..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "S'està suprimint llibres del llistat de metadades del dispositiu..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "S'està enviant metadades al dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "No s'ha instal·lat el SDK del Bambook"
 
@@ -1314,15 +1332,15 @@ msgstr "Comunica't amb un lector Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunica't amb tots els lectors Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Tots per títol"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Tots per autor"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1330,7 +1348,7 @@ msgstr ""
 "Llista dels camps de metadades separats per comes que es convertiran el "
 "col·leccions al dispositiu. Possibilitats: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1340,12 +1358,12 @@ msgstr ""
 "aquests valors per habilitar-les. Es donarà el nom que s'introdueixi després "
 "del caràcter «:» a les col·leccions."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 "Carrega miniatures de les portades per als llibres per separat (lectors nous)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1359,14 +1377,14 @@ msgstr ""
 "canviar la portada. AVÍS: aquesta opció només s'ha de fer servir amb els "
 "lectors Sony més nous: 350, 650, 950 i posteriors."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Actualitza les portades per separat quan s'utilitzi l'administració "
 "automàtica (lectors nous)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1376,11 +1394,11 @@ msgstr ""
 "cop que es connecti el dispositiu. Desactiveu-la si el número de llibres al "
 "lector no permet un rendiment acceptable."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Conserva la relació d'aspecte en generar miniatures"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1391,6 +1409,20 @@ msgstr ""
 "voleu que la miniatura tingui la mida màxima sense tenir en compte la "
 "relació d'aspecte."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr "Cerca llibres a totes les carpetes"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+"Aquesta opció fa que el calibre cerqui llibres a totes les carpetes del "
+"dispositiu i les seves targetes. Permet que el calibre trobi llibres que ha "
+"posat al dispositiu un altre programari o per descàrrega sense fils."
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1530,7 +1562,7 @@ msgstr "Personalització addicional"
 msgid "Communicate with an eBook reader."
 msgstr "Comunica't amb un lector de llibres electrònics."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Obté informació del dispositiu..."
 
@@ -2379,7 +2411,7 @@ msgstr "S'està convertint l'entrada a HTML..."
 msgid "Running transforms on ebook..."
 msgstr "S'està transformant el llibre..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "S'està creant"
 
@@ -2536,7 +2568,7 @@ msgstr "Inici"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "No insereixis un índex al començament del llibre."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2554,6 +2586,10 @@ msgstr ""
 "ajusteu els paràmetres de «Detecció de l'estructura» i/o «Índex» (activeu "
 "«Força l'ús de l'índex que es generi automàticament»)."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr "per a una llist complerta amb descripcions."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2958,105 +2994,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "ERROR A LA PLANTILLA"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "No"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Sí"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Tí­tol"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Editorial"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Productor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Comentaris"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Sèries"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Llengua"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Marca de temps"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Publicat"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Drets"
 
@@ -3503,7 +3539,7 @@ msgstr "Regne Unit"
 msgid "Amazon timed out. Try again later."
 msgstr "El temps d'espera d'Amazon s'ha esgotat. Intenteu-ho més tard."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Origen de les metadades"
 
@@ -3643,7 +3679,7 @@ msgid "HTML TOC generation options."
 msgstr "Opcions de generació de l'index HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3849,6 +3885,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Assumpte"
 
@@ -4201,92 +4238,96 @@ msgstr ""
 "combinat amb una opció de format de sortida de text que no és «cap» perquè "
 "les referències a les imatges se suprimeixen sempre a la sortida de text net."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Per defecte envia el fitxer a la targeta de memòria en lloc de fer-ho a la "
 "memòria principal."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Confirmeu abans de suprimir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Geometria de la finestra principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Aviseu-me quan hi hagi una nova versió disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Utilitza números romans per a sèries de números"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Ordena la llista d'etiquetes per nom, popularitat o per valoració"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr "Coincidènia amb totes o alguna de les etiquetes."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Nombre de portades que es mostraran en el mode de navegació per portades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Valors per defecte per a la conversió a LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opcions per al lector LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formats que s'obriran amb el visor intern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Columnes que es veuran a la llista de llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Arrenca automàticament el servidor de continguts en iniciar l'aplicació"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Les notícies antigues es conserven a la base de dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Mostra la icona a la safata del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Carrega al dispositiu les notícies que s'ha descarregat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 "Suprimeix els llibres de la biblioteca després de carregar-los al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 "Mostra la portada en una altra finestra enlloc de fer-ho a la principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Inhabilita els missatges des de la icona de la safata del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Acció per defecte per a quan es faci clic al botó d'enviar al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4294,7 +4335,7 @@ msgstr ""
 "Comença la cerca mentre teclegeu. Si s'inhabilita la cerca començarà quan es "
 "premi la tecla de retorn."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
@@ -4304,46 +4345,46 @@ msgstr ""
 "cerca en lloc de mostrar només les coincidències. Premeu «N» o «F3» per anar "
 "a la coincidència següent."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Nombre màxim de processos en espera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Descarrega metadades socials (etiquetes, valoració...)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Sobreescriu l'autor i el títol amb les noves metadades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Si n'hi ha, descarrega la portada automàticament"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Limita el màxim de tasques simultànies al nombre de CPUs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Disposició de la interfície de l'usuari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 "Mostra la mitjana de les valoracions per a cada element de l'explorador "
 "d'etiquetes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Desactiva les animacions"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "categories de l'explorador d'etiquetes que no s'han de mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Tria fitxers"
 
@@ -4563,8 +4604,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "No s'ha seleccionat cap llibre"
@@ -4772,7 +4813,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4845,7 +4886,7 @@ msgid "Bulk convert"
 msgstr "Conversió en grup"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "No es pot convertir"
 
@@ -4853,7 +4894,7 @@ msgstr "No es pot convertir"
 msgid "Starting conversion of %d book(s)"
 msgstr "S'està començant la conversió de %d llibre(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "Fitxer de sortida buit, probablement el procés de conversió ha fallat"
@@ -5046,7 +5087,7 @@ msgid "Stop Content Server"
 msgstr "Atura el servidor de contingut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Envia per correu electrònic a"
 
@@ -5054,32 +5095,32 @@ msgstr "Envia per correu electrònic a"
 msgid "Email to and delete from library"
 msgstr "Envia'l per correu electrònic i suprimeix-lo de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(suprimeix de la biblioteca)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Configura la compartició de llibres per correu electrònic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Envia al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Connecta/comparteix"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "S'està aturant"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "S'està aturant el servidor, pot trigar fins a un minut, espereu..."
@@ -5168,20 +5209,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "S'està descarregant {0} per a {1} llibre(s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "No es poden editar les metadades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "No es pot fusionar els llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "Cal seleccionar almenys dos llibres per fer una fusió"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5189,7 +5230,7 @@ msgstr ""
 "Esteu a punt de fusionar més de 5 llibres. Esteu <b>segur</b> que voleu "
 "continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5201,7 +5242,7 @@ msgstr ""
 "suprimira ni canviarà el segon ni els següents llibres seleccionats.<br> "
 "Confirmeu si voleu continuar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5222,7 +5263,7 @@ msgstr ""
 "següents llibres seleccionats. <br><br>Esteu <b>segur</b> que voleu "
 "continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5240,19 +5281,19 @@ msgstr ""
 "duplicats del segon i del següents llibres seleccionats de la biblioteca del "
 "calibre. <br><br>Esteu <b>segur</b> que voleu continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Notí­cies (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "S'està recollint notícies de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " s'ha recollit"
 
@@ -5317,7 +5358,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Executa l'assistent de benvinguda"
 
@@ -5568,7 +5609,7 @@ msgid "The specified directory could not be processed."
 msgstr "La carpeta que s'ha indicat no es pot processar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Cap llibre"
 
@@ -5789,8 +5830,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Camí"
 
@@ -5800,17 +5841,17 @@ msgstr "Camí"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formats"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Col·leccions"
 
@@ -5820,25 +5861,25 @@ msgid "Click to open"
 msgstr "Feu clic per obrir"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Cap"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Enganxa la portada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Copia la portada"
 
@@ -5896,7 +5937,7 @@ msgstr "sortida"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5919,14 +5960,14 @@ msgstr "sortida"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6522,10 +6563,14 @@ msgstr "No &insereixis un índex al començament del llibre"
 msgid "FB2 Output"
 msgstr "Sortida FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Divideix en seccions:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr "Gènere"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Assistent per redimensionar els tipus de lletra"
@@ -7157,7 +7202,7 @@ msgid "Regex:"
 msgstr "Expressió regular:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Prova-ho"
 
@@ -7772,21 +7817,21 @@ msgstr "Error"
 msgid "Error communicating with device"
 msgstr "Error a la comunicació amb el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "No hi ha formats adequats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Selecciona la carpeta que s'obrirà com a dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Hi ha hagut un error en comunicar-se amb el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7794,69 +7839,69 @@ msgstr ""
 "Hi ha hagut un error de comunicació amb el dispositiu. Traieu-lo i torneu-lo "
 "a connectar i/o torneu a iniciar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Dispositiu: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detectat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "seleccionat per enviar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i de %i llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 de %i llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Tria el format que s'enviarà al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "No hi ha cap dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "No s'ha pogut enviar: no hi ha cap dispositiu connectat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Sense targeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "No s'ha pogut enviar: el dispositiu no té targeta de memòria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "S'ha de convertir automàticament aquests llibres abans de carregar-los al "
 "dispositiu?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "S'estan enviant els catàlegs al dispositiu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "S'estan enviant les notícies al dispositiu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "S'estan enviant els llibres al dispositiu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7865,11 +7910,11 @@ msgstr ""
 "un format adequat. Convertiu primer el(s) llibre(s) a un format compatible "
 "amb el vostre dispositiu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "No hi ha espai al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>No es pot desar llibres al dispositiu perquè no hi ha prou espai "
@@ -8273,7 +8318,7 @@ msgstr "Trieu un format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -8418,7 +8463,7 @@ msgstr "D'ac&ord"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Cancel·la"
 
@@ -8467,8 +8512,8 @@ msgid "Location"
 msgstr "Ubicació"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8506,12 +8551,12 @@ msgid "Author sort"
 msgstr "Ordre per autor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "El nom de l'autor no és vàlid"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Els noms d'autor no poden contenir caràcters &."
 
@@ -8712,22 +8757,22 @@ msgid "Working"
 msgstr "S'està treballant..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Minúscules"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Majúscules"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Inicials en majúscula"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Posa en majúscules"
 
@@ -10396,12 +10441,12 @@ msgid "%s (was %s)"
 msgstr "%s (era %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "L'element està en blanc"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "No es pot deixar un element en blanc. En tot cas l'heu d'esborrar."
 
@@ -10473,7 +10518,7 @@ msgid "Send test mail from %s to:"
 msgstr "Envia un correu de prova de %s a:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Prova"
 
@@ -10729,64 +10774,64 @@ msgstr "No s'ha pogut descarregar"
 msgid "Failed to download from %r with error: %s"
 msgstr "No s'ha pogut descarregar de %r. Hi ha hagut l'error: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Envia per correu electrònic %s a %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Notícies:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "S'adjunta el diari %s descarregat pel calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "Llibre:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Hi trobareu el llibre adjunt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "per"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "en el format %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "S'està enviant correu electrònic a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "S'ha de convertir automàticament els llibres següents abans d'enviar-los per "
 "correu electrònic?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "No s'ha pogut enviar aquests llibres perquè no s'ha trobat formats adequats:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "No s'ha pogut enviar el llibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "s'ha enviat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "S'ha enviat notícies a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10810,67 +10855,85 @@ msgstr ""
 "group names for the various metadata entries are documented in "
 "tooltips.</p></div>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "&Expressió regular"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Nombre de fitxer:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Títol:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Expressió regular (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "No hi ha cap coincidència"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autors:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Expressió regular (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Sèrie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Expressió regular (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Número dins la sèrie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Expressió regular (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Expressió regular (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr "Editorial:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr "Expressió regular (?P<publisher>)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr "Publicat:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr "Expressió regular (?P<published>)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "el navegador de portades"
@@ -11083,48 +11146,48 @@ msgstr "S"
 msgid "Edit template"
 msgstr "Edita la plantilla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Grandària (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Llibre %s de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "El nom de la cerca és «{0}»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "L'UUID del llibre és «{0}»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "A la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Mida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "S'ha marcat per suprimir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Feu doble clic per a <b>edittar>/b><br>-me<b>"
 
@@ -11201,7 +11264,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>No</b> s'ha trobat coincidències per al text «<i>%s</i>»."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "No s'han trobat coincidències"
 
@@ -11218,12 +11281,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Barra d'eines del visor de LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Pàgina següent"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Pàgina anterior"
 
@@ -12139,19 +12202,29 @@ msgstr "Fes que sigui la pre&determinada"
 msgid "&Remove email"
 msgstr "Elimina d'ad&reça"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Enviament automàtic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formats per al correu. S'enviarà el primer format que coincideixi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+"Assumpte del correu electrònic que s'envia. Si es deixa en blanc el títol es "
+"farà servir com a assumpte. A més, es pot utilitzar les mateixes plantilles "
+"que a «Desa al disc» com {title} i {author_sort}."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -12160,7 +12233,7 @@ msgstr ""
 "<br>a aquesta adreça de correu electrònic (si està en un dels formats de la "
 "llista)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "nova adreça de correu electrònic"
 
@@ -12172,94 +12245,94 @@ msgstr "Estreta"
 msgid "Wide"
 msgstr "Ampla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Mitjana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Petita"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Gran"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Sempre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Mai"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Per inicial"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Repartit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Disposició de &la interfície d'usuari (caldrà reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Número de portades que es mostraran al mode explorador (caldrà reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Trieu &l'idioma (caldrà reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Mostra l&a mitjana de les valoracions a l'explorador d'etiquetes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Inhabilita totes les animacions. Útil si teniu un ordinador lent o vell."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Inhabilita les &animacions"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Habilita la icona a la safata del sis&tema (caldrà reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Mostra la pantalla de presentació a l'inici"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Inhabilita les &notificacions de la safata del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Fes servir números &romans per a les sèries"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Mostra el navegador de &portades en una finestra separada (caldrà reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr "Mètode de &partició de categories del navegador d'etiquetes:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -12273,11 +12346,11 @@ msgstr ""
 "tenir una llista de grups de mida fixa. Inabiliteu-ho si no voleu\n"
 "subcategories."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr "&Redueix si hi ha més elements que:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -12288,11 +12361,11 @@ msgstr ""
 "en subcategories. Si s'ha inhabilitat el mètode de repartició s'ignora "
 "aquest valor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr "Categories amb elements &jeràrquics:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -12308,52 +12381,48 @@ msgstr ""
 "«Català» i «Intriga» a sota de «Misteri». Si «etiquetes» no està\n"
 "al quadre, es mostrarà cada etiqueta en una línia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Barra d'eines"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Mida de la &icona:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Mostra el &text sota les icones:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "Divideix la barra d'eine&s en dues"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Tipus de lletra de la interfície:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Canvia el tipus de &lletra (caldrà reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Aplica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Restaura els pre&determinats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Desa els canvis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Cancel·la i torna a la vista general"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "No es pot tornar als predeterminats per a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -12361,7 +12430,7 @@ msgstr ""
 "Heu fet alguns canvis que fan que calgui reiniciar. Reinicieu el calibre "
 "quan pugueu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -12369,7 +12438,7 @@ msgstr ""
 "Heu fet canvis que fan que calgui reiniciar el calibre immediatament. No "
 "podreu establir més preferències fins que s'hagi reiniciat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Cal reiniciar"
@@ -13297,30 +13366,34 @@ msgid "The main toolbar"
 msgstr "Barra d'eines principal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr "Segona barra d'eines (opcional)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Barra d'eines principal quan es connecta un dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Menú contextual pel als llibres de la biblioteca del calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Menú contextual per als llibres del dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "No es pot afegir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "No es poden afegir totes les accions %s per a aquesta ubicació"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "No es pot suprimir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "No es poden suprimir les accions %s per a aquesta ubicació"
 
@@ -13427,7 +13500,7 @@ msgstr "Aplica els canvis que s'ha fet a l'ajustament"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Cerca"
@@ -13522,172 +13595,172 @@ msgstr "Feu clic per canviar"
 msgid "&Alternate shortcut:"
 msgstr "Drecera &alternativa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Canvia el nom de %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr "Edita l'ordre de %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr "Afegeix a la categoria d'u%suari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr "Fill de %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr "Suprimeix la cerca %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr "Suprimeix %s de la categoria %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Cerca %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "Cerca-ho tot excepte %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr "Afegeix una subcategoria a %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr "Suprimeix la categoria d'usuari %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Amaga la categoria %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Mostra la categoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Cerca llibres a la categoria %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "Cerca llibres que no estiguin a la categoria %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Gestiona %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Gestiona les cerques desades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Gestiona les categories d'usuari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Mostra totes les categories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Canvia el mètode de divisió per categories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr "El nom del terme de cerca agrupada és «{0}»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "El canvi dels autors de diversos llibres pot trigar una estona. N'esteu "
 "segur?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "El canvi de les metadadades de tots aquests llibres pot trigar una estona. "
 "N'esteu segur?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Cerques"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr "Canvia el nom a la categoria d'usuari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 "No es pot utilitzar punts al nom quan s'està canviant el nom de categories "
 "d'usuari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr "El nom %s ja s'està utilitzant"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "El nom de la cerca està duplicat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "El nom de cerca %s ja existeix."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr "Nova categoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr "Suprimeix una categoria d'usuari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr "%s no és una categoria d'usuari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr "%s conté elements. Segur que voleu suprimir-la?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr "Suprimeix una categoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr "La categoria d'usuari %s no existeix"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr "Afegeix a la categoria d'usuari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr "La categoria d'usuari %s no existeix"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Cerca un element al navegador d'etiquetes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13704,64 +13777,64 @@ msgstr ""
 "totes les categories alhora i es mostraran només els elements\n"
 "que continguin el text «foo»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "&Cerca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Troba el primer/següent element coincident"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Redueix totes les categories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "No hi ha més coincidències.</b><p> Feu clic a «Cerca» per tornar a la "
 "primera coincidència."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Ordena per nom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Ordena per popularitat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Ordena per valoració mitjana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Estableix l'ordre de les entrades a l'explorador d'etiquetes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Fes-ho coincidir tot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Qualsevol coincidència"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Quan es seleccionin múltiples entrades a l'explorador d'etiquetes fes que "
 "coincideixi una qualsevol o totes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Administra les categories d'&usuari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Afegiu les vostres categories a l'explorador d'etiquetes"
 
@@ -13841,23 +13914,23 @@ msgstr ""
 "el registre de depuració estarà disponible al fitxer: %s<p> El registre es "
 "mostrarà automàticament."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Error de conversió"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Recepta inhabilitada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Ha fallat</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Hi ha tasques actives. Segur que voleu sortir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13867,11 +13940,11 @@ msgstr ""
 "                      Si sortiu podeu malmetre el dispositiu.<br>\n"
 "                      Segur que voleu sortir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Tasques actives"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -14082,7 +14155,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opcions per personalitzar el visor de llibres electrònics"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Recorda la darrera mida de finestra que s'ha fet servir"
 
@@ -14168,36 +14241,36 @@ msgstr ""
 "Esteu editant una drecera de teclat, cal completar-ho primer fent clic fora "
 "del quadre d'edició de dreceres."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Cerca al diccionari"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Vés a..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Propera secció"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Secció anterior"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Inici del document"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Final del document"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Inici de la secció"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Final de la secció"
 
@@ -14275,78 +14348,78 @@ msgstr "Vista prèvia de la impressió"
 msgid "Clear list of recently opened books"
 msgstr "Suprimeix la llista de llibres oberts recentment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "S'està connectant amb dict-org per cercar: <b>%s</b>..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Tria un llibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "No s'ha trobat coincidències per a: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "S'està carregant el flux..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "S'està aplicant la disposició %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Marcador #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Afegeix un nou marcador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Introduïu el títol del marcador:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Gestiona els marcadors"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "S'està carregant el llibre..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "No s'ha pogut obrir el llibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opcions de control del visor de llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Si s'indica, la finestra del visor intentarà anar al primer pla quan "
 "s'iniciï."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Si s'indica, s'intentarà que la finestra del visor s'obri en pantalla "
 "completa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 "Dirigeix les alertes de javascript i els missatges de consola a la consola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -14424,27 +14497,27 @@ msgstr "Troba la coincidència anterior"
 msgid "Print eBook"
 msgstr "Imprimeix el llibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Canvia la caixa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Intercanvia la caixa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Arrossega per canviar la mida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Mostra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Amaga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Commuta"
 
@@ -15975,11 +16048,11 @@ msgstr ""
 "\n"
 "Per aconseguir ajuda per a un comandament: %%prog comandament --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "No s'ha donat cap etiqueta"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15995,16 +16068,16 @@ msgstr "%sLa valoració mitjana és %3.1f"
 msgid "Main"
 msgstr "Inici"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>S'està migrant la base de dades antiga a la biblioteca de %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "S'està copiant <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "S'està compactant la base de dades"
 
@@ -17231,95 +17304,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Font de notícies desconeguda"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "La recepta «%s» necessita usuari i contrasenya"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "S'ha finalitzat la baixada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "No s'ha pogut descarregar aquests articles:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "No s'ha pogut descarregar part d'aquests articles:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " des de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tEnllaços que han fallat:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "No s'ha pogut aconseguir l'article."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr "La traça de depuració està més amunt en aquest registre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr "Executeu amb -vv per saber-ne el motiu"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "S'està aconseguint els canals..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "S'ha aconseguit canals des de la pàgina principal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "S'està intentant descarregar la portada..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "S'està generant l'encapçalament..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "S'està iniciant la descàrrega [%d fils]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "S'ha descarregat els canals a %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "No s'ha pogut descarregar la portada: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "S'està descarregant la portada de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "S'ha descarregat la imatge de capçalera"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Article sense títol"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Article descarregat: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Ha fallat la descàrrega de l'article: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "S'està aconseguint el canal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -17327,7 +17400,7 @@ msgstr ""
 "No s'ha pogut entrar, comproveu el nom d'usuari i la contrasenya del servei "
 "de publicacions periòdiques del calibre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17871,6 +17944,9 @@ msgstr "No descarreguis els fulls d'estil CSS"
 #~ msgstr ""
 #~ "Estableix comunicació amb el lector de llibres electrònics BeBook Mini."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "No s'ha trobat cap connector vàlid a "
+
 #~ msgid " "
 #~ msgstr " "
 
@@ -17936,6 +18012,9 @@ msgstr "No descarreguis els fulls d'estil CSS"
 #~ msgid "DRM Error"
 #~ msgstr "Error de DRM"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Personalitza la barra d'eines"
+
 #~ msgid ""
 #~ "Try to turn chapters into individual sections. WARNING: This option is "
 #~ "experimental. It can cause conversion to fail. It can also produce "
@@ -18363,6 +18442,9 @@ msgstr "No descarreguis els fulls d'estil CSS"
 #~ msgid "Search as you type"
 #~ msgstr "Cerca mentre escriviu"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "Divideix la barra d'eine&s en dues"
+
 #~ msgid "Choose plugin"
 #~ msgstr "Tria de connector"
 
@@ -19539,6 +19621,9 @@ msgstr "No descarreguis els fulls d'estil CSS"
 #~ "        de dades per a tots els fitxers de la categoria.</p>\n"
 #~ "        "
 
+#~ msgid "Customize searching"
+#~ msgstr "Personalitza les cerques"
+
 #~ msgid "Downloads series information from ww2.kdl.org"
 #~ msgstr "Descarrega informació de la sèrie de ww2.kdl.org"
 
@@ -19561,3 +19646,9 @@ msgstr "No descarreguis els fulls d'estil CSS"
 #~ "valor de #gènere si A.B.C: {#gènere:sublist(-1,0,.)} s'obté "
 #~ "C<br/>{#gènere:sublist(0,1,.)} s'obté A<br/>{#gènere:sublist(0,-1,.)} s'obté "
 #~ "A.B"
+
+#~ msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
+#~ msgstr "Habilita l'omissió del quadre de recomanació «Connecta a iTunes»"
+
+#~ msgid "Skip 'Connect to iTunes' recommendation"
+#~ msgstr "Omet la recomanació «Connecta a iTunes»"
diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot
index e7dceffcf1..274068acf8 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.53\n"
-"POT-Creation-Date: 2011-04-01 11:59+MDT\n"
-"PO-Revision-Date: 2011-04-01 11:59+MDT\n"
+"Project-Id-Version: calibre 0.7.54\n"
+"POT-Creation-Date: 2011-04-08 10:54+MDT\n"
+"PO-Revision-Date: 2011-04-08 10:54+MDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: LANGUAGE\n"
 "MIME-Version: 1.0\n"
@@ -47,11 +47,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:428
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:433
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /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/extz.py:23
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:54
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:364
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
@@ -69,10 +70,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/identify.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/identify.py:359
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:43
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:69
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:82
@@ -118,8 +120,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
@@ -141,10 +143,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:112
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:90
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:216
 #: /home/kovid/work/calibre/src/calibre/library/database.py:914
@@ -213,247 +217,249 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:18
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:19
 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:54
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:55
 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:61
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:62
 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:91
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:92
 msgid "Create a TXTZ archive when a TXT file is imported containing Markdown or Textile references to images. The referenced images as well as the TXT file are added to the archive."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:218
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:228
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:238
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:249
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:259
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:215
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:227
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:247
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:289
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:299
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:309
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:320
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:332
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:353
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:364
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:374
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:385
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:395
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:406
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:319
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:329
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:340
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:352
+#: /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:405
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:415
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:426
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:343
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:363
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:417
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:437
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:430
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:440
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:450
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:472
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:483
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:471
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:481
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:514
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:524
 msgid "Set metadata in %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:461
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:504
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:492
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:535
 msgid "Set metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:822
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:871
 msgid "Look and Feel"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:824
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:836
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:847
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:858
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:870
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:873
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:885
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:896
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:907
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:919
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:828
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:877
 msgid "Adjust the look and feel of the calibre interface to suit your tastes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:834
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:883
 msgid "Behavior"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:840
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:889
 msgid "Change the way calibre behaves"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:845
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:894
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:218
 msgid "Add your own columns"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:851
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:900
 msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:905
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:911
 msgid "Customize the toolbars and context menus, changing which actions are available in each"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:917
 msgid "Searching"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:923
 msgid "Customize the way searching for books works in calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:879
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:928
 msgid "Input Options"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:881
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:892
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:903
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:930
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:941
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:952
 msgid "Conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:885
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:934
 msgid "Set conversion options specific to each input format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:890
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:939
 msgid "Common Options"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:896
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:945
 msgid "Set conversion options common to all formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:901
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:950
 msgid "Output Options"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:907
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:956
 msgid "Set conversion options specific to each output format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:912
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:961
 msgid "Adding books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:914
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:926
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:938
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:950
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:963
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:975
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:987
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:999
 msgid "Import/Export"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:918
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:967
 msgid "Control how calibre reads metadata from files when adding books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:924
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:973
 msgid "Saving books to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:930
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:979
 msgid "Control how calibre exports files from its database to disk when using Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:936
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:985
 msgid "Sending books to devices"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:942
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:991
 msgid "Control how calibre transfers files to your ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:948
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:997
 msgid "Metadata plugboards"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:954
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1003
 msgid "Change metadata fields before saving/sending"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:959
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1008
 msgid "Template Functions"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:961
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:997
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1009
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1020
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1010
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1046
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1058
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1069
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:965
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1014
 msgid "Create your own template functions"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:970
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1019
 msgid "Sharing books by email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:972
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:984
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1021
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1033
 msgid "Sharing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:976
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1025
 msgid "Setup sharing of books via email. Can be used for automatic sending of downloaded news to your devices"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:982
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1031
 msgid "Sharing over the net"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:988
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1037
 msgid "Setup the calibre Content Server which will give you access to your calibre library from anywhere, on any device, over the internet"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:995
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1044
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:268
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1001
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1050
 msgid "Add/remove/customize various bits of calibre functionality"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1007
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1056
 msgid "Tweaks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1013
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1062
 msgid "Fine tune how calibre behaves in various contexts"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1018
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1067
 msgid "Miscellaneous"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1024
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1073
 msgid "Miscellaneous advanced configuration"
 msgstr ""
 
@@ -670,11 +676,11 @@ msgstr ""
 msgid "Communicate with Android phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:92
 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:138
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:141
 msgid "Communicate with S60 phones."
 msgstr ""
 
@@ -883,7 +889,7 @@ msgid "Communicate with the Blackberry smart phone."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:14
-#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:253
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:254
 #: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:18
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:90
 msgid "Kovid Goyal"
@@ -913,7 +919,7 @@ msgstr ""
 msgid "Communicate with the PocketBook 602/603/902/903 reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:252
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:253
 msgid "Communicate with the PocketBook 701"
 msgstr ""
 
@@ -1915,6 +1921,22 @@ msgstr ""
 msgid "Extract the contents of the generated ZIP file to the specified directory. WARNING: The contents of the directory will be deleted."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/htmlz/output.py:29
+msgid ""
+"Specify the handling of CSS. Default is class.\n"
+"class: Use CSS classes and have elements reference them.\n"
+"inline: Write the CSS as an inline style attribute.\n"
+"tag: Turn as many CSS styles as possible into HTML tags."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/htmlz/output.py:37
+msgid ""
+"How to handle the CSS when using css-type = 'class'.\n"
+"Default is external.\n"
+"external: Use an external CSS file that is linked in the document.\n"
+"inline: Place the CSS in the head section of the document."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
 msgstr ""
@@ -2206,19 +2228,19 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:593
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:593
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
@@ -2227,12 +2249,13 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:58
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
@@ -2240,29 +2263,29 @@ msgstr ""
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:680
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:94
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
@@ -2275,7 +2298,7 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:685
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
@@ -2287,24 +2310,25 @@ msgstr ""
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:58
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:692
 msgid "Rights"
 msgstr ""
 
@@ -2444,11 +2468,12 @@ msgid "Convert comments downloaded from %s to plain text"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:181
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:157
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:160
 msgid "Downloads metadata from Google Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/isbndb.py:15
 msgid "Downloads metadata from isbndb.com"
 msgstr ""
 
@@ -2643,31 +2668,31 @@ msgstr ""
 msgid "Cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:283
 msgid "Downloads metadata from Amazon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:287
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:292
 msgid "US"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:293
 msgid "France"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:294
 msgid "Germany"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:295
 msgid "UK"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:375
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:380
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:138
 msgid "Metadata source"
 msgstr ""
 
@@ -2787,7 +2812,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/cover.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:220
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:722
 msgid "Book %s of %s"
 msgstr ""
 
@@ -3302,7 +3327,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:532
 msgid "Books"
 msgstr ""
 
@@ -3492,10 +3517,10 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -3564,79 +3589,79 @@ msgstr ""
 msgid "Choose calibre library to work with"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:94
 msgid "Switch/create library..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:105
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:77
 msgid "Quick switch"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:78
 msgid "Rename library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:79
 msgid "Delete library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:112
 msgid "Pick a random book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:132
 msgid "Library Maintenance"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:133
 msgid "Library metadata backup status"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:137
 msgid "Start backing up metadata of all books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:141
 msgid "Check library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:145
 msgid "Restore database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:221
 msgid "Rename"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:222
 msgid "Choose a new name for the library <b>%s</b>. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:223
 msgid "Note that the actual library folder will be renamed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:230
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:199
 msgid "Already exists"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:231
 msgid "The folder %s already exists. Delete it first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:237
 msgid "Rename failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:238
 msgid "Failed to rename the library at %s. The most common cause for this is if one of the files in the library is open in another program."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:249
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:368
@@ -3648,31 +3673,31 @@ msgstr ""
 msgid "Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:250
 msgid "All files from %s will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:270
 msgid "none"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:271
 msgid "Backup status"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:272
 msgid "Book metadata files remaining to be written: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:278
 msgid "Backup metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:279
 msgid "Metadata will be backed up while calibre is running, at the rate of approximately 1 book every three seconds."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:106
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:111
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:286
@@ -3680,11 +3705,11 @@ msgstr ""
 msgid "Success"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 msgid "Found no errors in your calibre library database. Do you want calibre to check if the files in your  library match the information in the database?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
@@ -3695,39 +3720,39 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:318
 msgid "Database integrity check failed, click Show details for details."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:323
 msgid "No problems found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:324
 msgid "The files in your library match the information in the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:333
 msgid "No library found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:334
 msgid "No existing calibre library was found at %s. It will be removed from the list of known libraries."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:395
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:405
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:789
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:401
 msgid "You cannot change libraries while using the environment variable CALIBRE_OVERRIDE_DATABASE_PATH."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:406
 msgid "You cannot change libraries while jobs are running."
 msgstr ""
 
@@ -3957,12 +3982,12 @@ msgid "Connect/share"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:79
 msgid "Stopping"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:80
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
 
@@ -3974,106 +3999,106 @@ msgstr ""
 msgid "Manage the collections on this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:25
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:25
 msgid "Edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:28
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:29
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:30
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:32
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:35
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:38
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:41
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:43
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:46
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:52
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:55
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:59
 msgid "Merge only formats into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:100
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:102
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:102
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:227
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:103
 msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:223
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:263
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:264
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
 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/edit_metadata.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:275
 msgid "Book formats and metadata from the selected books will be added to the <b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<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/actions/edit_metadata.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:287
 msgid "Book formats from the selected books will be merged into the <b>first selected book</b> (%s). Metadata in the first selected book will not be changed.Author, Title, ISBN and all other metadata will <i>not</i> be merged.<br><br>After merger the second and subsequently selected books, with any metadata they have 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 calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:303
 msgid "Book formats and metadata from the selected books will be merged into the <b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<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 calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
@@ -4569,7 +4594,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:27
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:484
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:487
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:145
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
@@ -4614,7 +4639,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:351
 msgid "None"
 msgstr ""
 
@@ -4628,7 +4653,7 @@ msgstr ""
 msgid "Copy Cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:483
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:486
 msgid "Double-click to open Book Details window"
 msgstr ""
 
@@ -4643,6 +4668,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/htmlz_output.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:20
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:15
@@ -4662,6 +4688,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:19
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:15
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/htmlz_output.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:20
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:15
@@ -4684,6 +4711,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/htmlz_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:158
@@ -5434,6 +5462,18 @@ msgstr ""
 msgid "Replace entity indents with CSS indents"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/htmlz_output.py:14
+msgid "HTMLZ Output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/htmlz_output_ui.py:45
+msgid "How to handle CSS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/htmlz_output_ui.py:46
+msgid "How to handle class based CSS"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
 msgstr ""
@@ -5590,38 +5630,38 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:643
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:662
 msgid "Choose cover for "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:187
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:651
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:670
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:188
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:671
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:196
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:203
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:187
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:679
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:197
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:661
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:680
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:204
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:671
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:690
 msgid " is not a valid picture"
 msgstr ""
 
@@ -5650,7 +5690,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:165
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:62
 msgid "Change the title of this book"
 msgstr ""
 
@@ -5689,7 +5729,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:544
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:433
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:214
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:295
 msgid "&Series:"
 msgstr ""
 
@@ -5699,7 +5739,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:546
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:434
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:294
 msgid "List of known series. You can add new series."
 msgstr ""
 
@@ -5894,13 +5934,13 @@ msgid "Goto:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:96
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:96
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:89
 msgid "&Previous"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:88
 msgid "&Next"
 msgstr ""
@@ -5968,7 +6008,7 @@ msgid "Options specific to the input format."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:91
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:53
@@ -6187,8 +6227,8 @@ msgid "TXTZ Output"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:62
@@ -6296,7 +6336,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:215
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:248
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:252
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:994
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1028
 msgid "Undefined"
 msgstr ""
 
@@ -6626,7 +6666,7 @@ msgstr ""
 msgid "&Tags to set on created book entries:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:95
 msgid "Fit &cover within view"
 msgstr ""
 
@@ -6917,12 +6957,12 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:63
 msgid "&Title:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:157
 msgid "&Author(s):"
 msgstr ""
 
@@ -7022,13 +7062,13 @@ msgstr ""
 
 #:
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Invalid author name"
 msgstr ""
 
 #:
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1435
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7212,22 +7252,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:424
 msgid "Capitalize"
 msgstr ""
 
@@ -7359,7 +7399,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:530
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:424
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:786
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:805
 msgid "&Rating:"
 msgstr ""
 
@@ -7367,7 +7407,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:532
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:425
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:426
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:787
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:806
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
@@ -7388,7 +7428,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:539
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:431
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:145
 msgid "Open Tag Editor"
 msgstr ""
 
@@ -7441,7 +7481,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:558
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:440
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:978
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1012
 msgid "&Date:"
 msgstr ""
 
@@ -7514,14 +7554,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:581
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:465
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:397
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:549
 msgid "&Basic metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:582
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:466
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:426
 msgid "&Custom metadata"
 msgstr ""
 
@@ -7676,44 +7716,43 @@ msgid "&Search and replace"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:429
 msgid "Last modified: %s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:255
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:273
 msgid "Could not read cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:267
 msgid "Could not read cover from %s format"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:274
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:746
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:765
 msgid "Cover size: %dx%d pixels"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:689
 msgid "Not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:214
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:697
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:716
 msgid "Specify title and author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:215
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:698
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:717
 msgid "You must specify a title and author before generating a cover"
 msgstr ""
 
@@ -7755,59 +7794,59 @@ msgid "The cover is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:307
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:530
 msgid "Choose formats for "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:562
 msgid "No permission"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:563
 msgid "You do not have permission to read the following files:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:367
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:594
 msgid "No format selected"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:378
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:605
 msgid "Could not read metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:606
 msgid "Could not read metadata from %s format"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:231
 msgid " The green color indicates that the current author sort matches the current author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:456
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:234
 msgid " The red color indicates that the current author sort does not match the current author. No action is required if this is what you want."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:463
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:121
 msgid " The green color indicates that the current title sort matches the current title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:466
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:124
 msgid " The red color warns that the current title sort does not match the current title. No action is required if this is what you want."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:472
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:52
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:106
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:221
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:384
@@ -7816,13 +7855,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:475
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:484
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:379
 msgid "Save changes and edit the metadata of %s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:481
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:418
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:107
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:211
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:401
@@ -7831,22 +7871,22 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:690
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:695
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:951
 msgid "This ISBN number is valid"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:698
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:920
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:954
 msgid "This ISBN number is invalid"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:783
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:881
 msgid "Tags changed"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:784
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:882
 msgid "You have changed the tags. In order to use the tags editor, you must either discard or apply these changes. Apply changes?"
 msgstr ""
 
@@ -7875,12 +7915,12 @@ msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:961
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:321
 msgid "Permission denied"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:962
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:322
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
@@ -7893,19 +7933,19 @@ msgid "Meta information"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:94
 msgid ""
 "Automatically create the title sort entry based on the current title entry.\n"
 "Using this button to create title sort will change title sort from red to green."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:116
 msgid "Swap the author and title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:415
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:105
 msgid ""
 "Automatically create the author sort entry based on the current author entry.\n"
 "Using this button to create author sort will change author sort from red to green."
@@ -7916,7 +7956,7 @@ msgid "Title &sort: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:419
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:111
 msgid "Specify how this book should be sorted when by title. For example, The Exorcist might be sorted as Exorcist, The."
 msgstr ""
 
@@ -7925,19 +7965,18 @@ msgid "Author S&ort: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:217
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles Dickens should be sorted as Dickens, Charles.\n"
 "If the box is colored green, then text matches the individual author's sort strings. If it is colored red, then the authors and this text do not match."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:436
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:123
 msgid "Remove unused series (Series that have no books)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:439
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:886
 msgid "IS&BN:"
 msgstr ""
 
@@ -7946,17 +7985,17 @@ msgid "dd MMM yyyy"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1029
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1063
 msgid "Publishe&d:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:445
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:161
 msgid "&Fetch metadata from server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:448
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:623
 msgid "&Browse"
 msgstr ""
 
@@ -7965,7 +8004,7 @@ msgid "Remove border (if any) from cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:450
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:625
 msgid "T&rim"
 msgstr ""
 
@@ -7974,12 +8013,12 @@ msgid "Reset cover to default"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:627
 msgid "&Remove"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:633
 msgid "Download co&ver"
 msgstr ""
 
@@ -7988,7 +8027,7 @@ msgid "Generate a default cover based on the title and author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:455
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:634
 msgid "&Generate cover"
 msgstr ""
 
@@ -8005,7 +8044,7 @@ msgid "Remove the selected formats for this book from the database."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:448
 msgid "Set the cover for the book from the selected format"
 msgstr ""
 
@@ -8014,7 +8053,7 @@ msgid "Update metadata from the metadata in the selected format"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:464
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:608
 msgid "&Comments"
 msgstr ""
 
@@ -8430,7 +8469,7 @@ msgid "&Author:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:215
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:846
 msgid "Ta&gs:"
 msgstr ""
 
@@ -8608,12 +8647,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1381
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -8893,6 +8932,7 @@ msgid "Downloading <b>%s</b> from %s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dnd.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:368
 msgid "Download failed"
 msgstr ""
 
@@ -9358,6 +9398,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
@@ -9539,43 +9580,61 @@ msgstr ""
 msgid "Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:113
 msgid "Title &sort:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:222
 msgid "Author s&ort:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:350
 msgid "&Number:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:431
+msgid ""
+"Last modified: %s\n"
+"\n"
+"Double click to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:735
 msgid "Invalid cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:736
 msgid "Could not change cover as the image is invalid."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:744
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:763
 msgid "This book has no cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:813
 msgid "stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:847
 msgid "Tags categorize the book. This is particularly useful while searching. <br><br>They can be any wordsor phrases, separated by commas."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:927
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:905
+msgid "I&ds:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:906
+msgid ""
+"Edit the identifiers for this book. For example: \n"
+"\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:961
 msgid "&Publisher:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1031
 msgid "Clear date"
 msgstr ""
 
@@ -9621,32 +9680,64 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:71
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:225
 msgid "Edit Metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:443
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:627
 msgid "Change cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:514
 msgid "Co&mments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:536
 msgid "&Metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:541
 msgid "&Cover and formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:596
 msgid "C&ustom metadata"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:58
+msgid "Has cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:58
+msgid "Has summary"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:299
+msgid "calibre is downloading metadata from: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:321
+msgid "Downloading"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:350
+msgid "Query: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:369
+msgid "Failed to download metadata. Click Show Details to see details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:378
+msgid "Failed to find any books that match your search. Try making the search <b>less specific</b>. For example, use only the author's last name and a single distinctive word from the title.<p>To see the full log, click Show Details."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:407
+msgid "Downloading metadata..."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:36
 msgid "Restore settings to default values. You have to click Apply to actually save the default settings."
 msgstr ""
@@ -10225,7 +10316,7 @@ msgid "Wide"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
-msgid "Medium"
+msgid "Off"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
@@ -10236,6 +10327,10 @@ msgstr ""
 msgid "Large"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+msgid "Medium"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
@@ -10391,7 +10486,7 @@ msgid "The changes you have made require calibre be restarted immediately. You w
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:127
 msgid "Restart needed"
 msgstr ""
 
@@ -10813,20 +10908,20 @@ msgstr ""
 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->Advanced->Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:106
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:113
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:128
 msgid "You need to restart the server for changes to take effect"
 msgstr ""
 
@@ -11157,7 +11252,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:653
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11334,80 +11429,80 @@ msgstr ""
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1064
 msgid "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1069
 msgid "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1152
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1387
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1407
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1416
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1440
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1842
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1894
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1897
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1919
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1939
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2062
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -11417,59 +11512,59 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2074
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2079
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2084
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2122
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2125
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2132
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2132
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2137
 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:2140
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2141
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2144
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12070,27 +12165,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:962
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1004
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1041
 msgid "Toggle"
 msgstr ""
 
diff --git a/src/calibre/translations/cs.po b/src/calibre/translations/cs.po
index 8003c15e77..0c6b480e4c 100644
--- a/src/calibre/translations/cs.po
+++ b/src/calibre/translations/cs.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-07 22:20+0000\n"
 "Last-Translator: Marek Sušický <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: 2011-03-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:42+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Nedělá vůbec nic"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Nedělá vůbec nic"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Nedělá vůbec nic"
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Základ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Přizpůsobit"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Nemůžu nastavit"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Typ souboru"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Vstup metadat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Zápis metadat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generátor katalogu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Akce uživatelského rozhraní"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Předvolby"
@@ -333,8 +333,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Přidejte/odeberte své vlastní sloupce ze seznamu knih calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Upravit panel nástrojů"
+msgid "Toolbar"
+msgstr "Panel nástrojů"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -343,8 +343,8 @@ msgid ""
 msgstr "Přizpůsobení panelu nástrojů a místních nabídek"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Upravit vyhledávání"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -678,35 +678,31 @@ msgstr "Tento profil je určený pro B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Tento profil je určený pro Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Nainstalované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Přiřazení modulů k formátům souborů"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Vlastní nastavení místních modulů"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Zakázané moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Povolené moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Nebyl nalezen žádný platný modul v "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicializace modulu %s selhala s chybou:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -718,31 +714,31 @@ msgstr ""
 "    Přizpůsobte calibre nahráním externích modulů.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Přidejte modul zadáním cesty k archivu ZIP, ve kterém se nachází."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Odebrat vlastní modul podle jména. Nemá žádný vliv na vestavěné moduly."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 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ými čárkou."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Vypsat všechny nainstalované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Povolit uvedený modul"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Zakázat uvedený modul"
 
@@ -766,43 +762,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Komunikovat s telefony S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Použít sérii jako kategorii v iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Ukládat obálky z iTunes/iBooks do mezipaměti"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Zařízení Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Komunikovat s iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Nalezeno zařízení Apple, spouštění iTunes, čekejte..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -810,27 +818,27 @@ msgstr ""
 "Nelze kopírovat knihy přímo z iDevice. Přetáhněte je z knihovny iTunes na "
 "plochu a pak je přidejte do okna knihovny calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Záznamy metadat v zařízení se aktualizují..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d z %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "dokončeno"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -840,7 +848,7 @@ msgstr ""
 "Smazat pomocí aplikace iBooks.\n"
 "Pro zobrazení seznamu klepněte na 'Zobrazit podrobnosti'."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -848,31 +856,31 @@ msgstr ""
 "Některé obálky nelze převést.\n"
 "Pro zobrazení seznamu klepněte na 'Zobrazit podrobnosti'."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Zprávy"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Komunikovat s iTunes."
 
@@ -923,20 +931,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Získávání seznam knih v zařízení..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Přenos knih do zařízení..."
 
@@ -944,8 +952,8 @@ msgstr "Přenos knih do zařízení..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Přidávání knih do seznamu metadat v zařízení..."
 
@@ -955,8 +963,8 @@ msgstr "Přidávání knih do seznamu metadat v zařízení..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Odebírání knih ze zařízení..."
 
@@ -964,17 +972,17 @@ msgstr "Odebírání knih ze zařízení..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Odebírání knih ze seznamu metadat v zařízení..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Odesílání metadat do zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Nebyl nainstalován Bambook SDK."
 
@@ -1279,15 +1287,15 @@ msgstr "Komunikace se čtečkou Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Komunikace se všemi čtečkami Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Vše podle názvu"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Vše podle autora"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1295,7 +1303,7 @@ msgstr ""
 "Čárkami oddělený seznam polí metadat, ze kterých se má vytvořït sbírka v "
 "zařízeni. Možnosti zahrnují: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1305,11 +1313,11 @@ msgstr ""
 "do seznamu, abyste je povolili. Sbírky dostanou název uvedený za znakem "
 "\":\"."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Nahrát samostatné náhledy obálek knih (novější čtečky)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1323,13 +1331,13 @@ msgstr ""
 "UPOZORNĚNÍ: Tato volba by měla být používána pouze s novějšími čtečkami "
 "SONY: 350, 650, 900 a novějšími."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Obnovit samostatné obálky při použití automatické správy (novější čtečky)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1339,11 +1347,11 @@ msgstr ""
 "připojíte zařízení. Zakažte tuto volbu, pokud máte ve čtečce tolik knih, že "
 "je výkon nepřijatelný."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Zachovat poměr stran obálky při sestavování náhledů"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1353,6 +1361,17 @@ msgstr ""
 "stran (šířka ku výšce) jako obálka. Zakažte tuto volbu, pokud chcete, aby "
 "měl náhled maximální velikost bez ohledu na poměr stran."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1489,7 +1508,7 @@ msgstr "Další přizpůsobení"
 msgid "Communicate with an eBook reader."
 msgstr "Komunikace se čtečkou elektronických knih"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Zjistit informace o zařízení..."
 
@@ -2300,7 +2319,7 @@ msgstr "Převod vstupu na HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Probíhá převod elektronické knihy..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Vytváření"
 
@@ -2454,7 +2473,7 @@ msgstr "Spustit"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Nevkládat obsah na začátek knihy."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2471,6 +2490,10 @@ msgstr ""
 "\"detekce struktury\" a/nebo \"obsahu\" (zapněte \"Vynutit použití "
 "automaticky generovaného obsahu\")."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2867,105 +2890,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "CHYBA ŠABLONY"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Ne"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Ano"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Název"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autoři"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Vydavatel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Komentáře"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Štítky"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Série"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Jazyk"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Časové razítko"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Vydáno"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Práva"
 
@@ -3385,7 +3408,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Zdroj meta dat"
 
@@ -3522,7 +3545,7 @@ msgid "HTML TOC generation options."
 msgstr "Volby generátoru obsahu HTML"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3721,6 +3744,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Předmět"
 
@@ -4044,87 +4068,91 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "Ukládat soubory na pamětovou kartu, ne do hlavní paměti zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Vyžadovat potvrzení před smazáním"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Uspořádání hlavního okna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Upozornit pokud je dostupná nová verze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Používat římské číslice pro číslování sérií"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Seřadit tagy podle jména, popularity, nebo hodnocení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Počet obálek, které se mají zobrazovat v režimu prohlížení obálek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Standadní nastavení převodu do formátu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Možnosti prohlížeče elektronických knih ve formátu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formáty zobrazované interním prohlížečem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Sloupce které se mají zobrazit v seznamu knih"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Automaticky spouštět obsahový server při startu aplikace"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Nejstarší zprávy ponechané v databázi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Zobrazit ikonu v systémovém panelu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Odelsat stažené zpravy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Smazat knihy z knihovny po jejich odeslání do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 "Zobrazit galerii obálek v odděleném okně, namísto hlavního okna calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Zakázat oznamování v systemové oblasti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Výchozí akce, která se provede po stisku tlačítka odeslat do přístroje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4132,51 +4160,51 @@ msgstr ""
 "Vyhledávání během psaní. Pokud je tato volba vypnutá, začne vyhledávání až "
 "poté, co je stisknut Enter."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maximální počet procesů ve frontě"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Stáhnout sociální metadata (tagy/hodnocení/atd.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Přepsat autora a název novými metadaty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Automaticky stáhnout obálku, pokud je dostupná"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Omezit maximální počet jobů na počet CPU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Rozvržení uživatelského rozhraní"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Zobrazit průměrné hodnocení na položku v prohlížeči tagů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Zakázat UI animace"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "kategorie, která se nebude zobrazovat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Zvol soubory"
 
@@ -4391,8 +4419,8 @@ msgstr "Uživatelské anotace generované jen z hlavní knihovny"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nejsou označeny žádné knihy"
@@ -4591,7 +4619,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4661,7 +4689,7 @@ msgid "Bulk convert"
 msgstr "Převést dávkově"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Nemůžu převást"
 
@@ -4669,7 +4697,7 @@ msgstr "Nemůžu převást"
 msgid "Starting conversion of %d book(s)"
 msgstr "Zahajuji konverzi %d knih(y)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "Výstupní soubor je prázdný, pravděpodobně proces převodu havaroval"
 
@@ -4857,7 +4885,7 @@ msgid "Stop Content Server"
 msgstr "Zastavit server s obsahem"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Zaslat e-mail do"
 
@@ -4865,32 +4893,32 @@ msgstr "Zaslat e-mail do"
 msgid "Email to and delete from library"
 msgstr "Odeslat emailem a smazat z knihovny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(smazat z knihovny)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Nastavit sdílení knih založené na emailu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Odeslat do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Připojit/sdílet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Zastavuji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "Zastavuji server, to může trvat až minutu, prosím, čekejte..."
@@ -4977,26 +5005,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Stahování {0} pro {1} knih(y)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Nemůžu upravit metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Nemohu sloučit knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "Pro sloučení je nutné označit nejméně 2 knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr "Chystáte se spojit více než 5 knih. Jste si jisti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5008,7 +5036,7 @@ msgstr ""
 "vybrané knihy nebudou odstraněny nebo změněny.<br><br>Prosím potvrďte, že "
 "chcete pokračovat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5020,7 +5048,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5031,19 +5059,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Stáhnout zprávy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Získávám zprávy z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " získány."
 
@@ -5108,7 +5136,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Spustit uvítacího průvodce"
 
@@ -5358,7 +5386,7 @@ msgid "The specified directory could not be processed."
 msgstr "Zadaný adresář nebylo možné zpracovat."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Žádné knihy"
 
@@ -5575,8 +5603,8 @@ msgstr "&Více knih ve složce znamené, že každý ebook soubor je různá kni
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Cesta"
 
@@ -5586,17 +5614,17 @@ msgstr "Cesta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formáty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Kolekce"
 
@@ -5606,25 +5634,25 @@ msgid "Click to open"
 msgstr "Klikněte pro otevření"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Žádné"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Vložit obálku"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Kopírovat obálku"
 
@@ -5682,7 +5710,7 @@ msgstr "výstup"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5705,14 +5733,14 @@ msgstr "výstup"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6294,10 +6322,14 @@ msgstr "Nevkládat obsah na začátek knihy."
 msgid "FB2 Output"
 msgstr "FB2 Výstup"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Rozdělit do sekcí:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Průvodce změnou velikosti fontů"
@@ -6898,7 +6930,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7493,21 +7525,21 @@ msgstr "Chyba"
 msgid "Error communicating with device"
 msgstr "Cyba komunikace se zařízením"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Žádné vhodné formáty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Označit složku a otevřít jako zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Chyba komunikace se zařízením"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7515,68 +7547,68 @@ msgstr ""
 "Dočasná chyba komunikace se zařízením. Prosím odpojte a znovu připojte "
 "zařízení anebo restarujte počítač."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Zařízení: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " nalezeno."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "vybrané k odeslání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i z %i Knih"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 z %i Knih"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 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:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Žádné zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 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:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Žádná karta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Automaticky zkonvertovat následující knihy, než se nahrají do zařízení?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Odeslat katalog do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Odesílám zprávy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Odesílám knihy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7585,11 +7617,11 @@ msgstr ""
 "žádné vhodné formáty. Převést knihu(y) do formátu, které přístroj primárně "
 "podporuje."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Na zařízení není volné místo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7889,7 +7921,7 @@ msgstr "Vyberte formát"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formát"
 
@@ -8025,7 +8057,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Zrušit"
 
@@ -8074,8 +8106,8 @@ msgid "Location"
 msgstr "Umístění"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8107,12 +8139,12 @@ msgid "Author sort"
 msgstr "Třídění podle autora"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Neplatné jméno autora"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Jméno autora nemůže obsahovat znaky &."
 
@@ -8303,22 +8335,22 @@ msgid "Working"
 msgstr "Pracuje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Malá písmena"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Velká písmena"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Velikost písma v nadpise"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Velká počáteční písmena"
 
@@ -9855,12 +9887,12 @@ msgid "%s (was %s)"
 msgstr "%s (bylo %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Položka je prázdná"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "Položka nemůže být nastavena na nic. Smažte ji."
 
@@ -9931,7 +9963,7 @@ msgid "Send test mail from %s to:"
 msgstr "Poslat testovací mail od %s pro:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -10179,62 +10211,62 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "E-mail %s pro %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Zprávy:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Přiložen je %s časopis stažený calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Přiloženo, najdete e-book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "v %s formátu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Odeslat email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "Automaticky konvertovat knihy před emailovým odesláním?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Nemohu emailovat následující knihy, nebyl nalezen žádný vhodný formát:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Chyba při odeslání knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "odesláno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Odeslat zprávy do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10248,67 +10280,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Regulární &výraz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Název &souboru:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Název:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regulární výraz (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Žádná shoda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autoři:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Regulární výraz (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Série:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regulární výraz (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Pořadí v sérii:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regulární výraz (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regulární výraz (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Prohlížeč obálek"
@@ -10519,48 +10569,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Upravit šablonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Na zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Kniha %s z %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Hledaný název je \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "UUID knihy je \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "V knihovně"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Velikost"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Označeno ke smazání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dvakrát klikněte na <b>upravit</b> mě<br><br>"
 
@@ -10637,7 +10687,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "Pro hledaný výraz <i>%s</i> nebyly nalezeny <b>žádné výsledky</b>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Nebyly nalezeny žádné výsledky"
 
@@ -10654,12 +10704,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Nástrojová išta prohlížeče LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Následující strana"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Předcházející strana"
 
@@ -11508,19 +11558,26 @@ msgstr "Nastavit &výchozí"
 msgid "&Remove email"
 msgstr "Odst&ranit email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Automaticky odeslat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formáty pro e-mail. První odpovídající formát bude zaslán."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11528,7 +11585,7 @@ msgstr ""
 "Pokud je zaškrtnuto, stažené zprávy jsou automaticky odeslány na tuto "
 "emailovou adresu (za předpokladu, že je v jednom z uvedených formátů)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "nová emailová adresa"
 
@@ -11540,92 +11597,92 @@ msgstr "Úzký"
 msgid "Wide"
 msgstr "Široký"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Střední"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Malé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Velké"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Vždy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nikdy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Podle prvního písmena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Deaktivováno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Rozděleno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "&Rozvržení uživatelského rozhraní (vyžaduje restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "Počet obálek zobraze&ných v režimu prohlížení (vyžaduje restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Vyberte &jazyk (vyžaduje restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Zobrazit &průměrné hodnocení v prohlížeči tagů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Zablokovat všechny animace. Použitelné, pokud máte starý-pomalý počítač."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Zablokovat &animace"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 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/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Zobrazit úvodní obrazovku při startu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Zablokovat oznámení v systémové liště"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Použít římské číslice pro série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Zobrazit prohlížeč &obálek v samostatném okně (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11634,22 +11691,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11659,52 +11716,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Nástrojová lišta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Velikost ikon:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Zobrazit text pod ikonami:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "Rozdělit nástrojovou lištu do dvou lišt."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Změnit &font (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "Použít"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Obnovit výchozí hodnoty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Ulož změny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Zrušit a vrátit se na přehled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Obnova do výchozích hodnot není podporována pro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11712,7 +11765,7 @@ msgstr ""
 "Některé provedené změny vyžadují restart. Prosím, restartujte Calibre co "
 "nejdříve."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11720,7 +11773,7 @@ msgstr ""
 "Změny, které jste vykonali, vyžadují restartování calibre. Nebudete moci "
 "změnit žádné další nastavení, dokud calibre nerestartujete."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Vyžadován restart"
@@ -12479,30 +12532,34 @@ msgid "The main toolbar"
 msgstr "Hlavní lišta"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Hlavní lišta, když je připojené zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Kontextové menu pro knihy v calibre knihovně"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Kontextové menu pro knihy v zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Nemohu přidat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Nemohu přidat akce %s do tohoto umístění"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Nemohu odebrat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Nemohu odebrat akce %s z umístění"
 
@@ -12601,7 +12658,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Hledat"
@@ -12694,166 +12751,166 @@ msgstr "Klik pro změnu"
 msgid "&Alternate shortcut:"
 msgstr "&Alternativní zkratka:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Přejmenovat %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Hledat %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Skrýt kategorii %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Zobrazit kategorii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Hledat knihy v kategorii %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Spravovat %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Spravovat uložená hledání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Spravovat uživatelské kategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Zobrazit všechny kategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr "Změna autorů pro mnoho knih může trvat delší dobu. Jste si jisti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr "Změna metadat pro tak mnoho knih bude trvat dlouho. Jste si jisti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Hledání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Zduplikovat hledané jméno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "Uložené vyhledávací jméno %s je již používáno."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12863,62 +12920,62 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "Alt+F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "&Hledat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Sbalit všechny kategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Seřadit dle jména"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Seřadit dle popularity"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Seřadit podle průměrného hodnocení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Nastavit pořadí položek v Tag prohlížeči"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Porovnat vše"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Najít kterékoliv"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Když se označí více záznamů v Prohlížeči tagů, najdi libovolný, nebo všechny "
 "z nich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Spravovat uživatelské kategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Přidat vaše vlastní kategorie do Tag Browseru"
 
@@ -12994,23 +13051,23 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Chyba převodu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Zdroj zakázán"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Selhalo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13020,11 +13077,11 @@ msgstr ""
 "                      Ukončení může způsobit poškození v zařízení.<br>\n"
 "                      Jste si jisti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Aktivní joby"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13229,7 +13286,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Možnosti úpravy prohlížeče elektronických knih"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Zapamatuj si posledně použitou velikost okna"
 
@@ -13311,36 +13368,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "Podívat do slovníku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Přejít na..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Další sekce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Předchozí sekce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Začátek dokumentu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Konec dokumentu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Začátek sekce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Konec sekce"
 
@@ -13416,75 +13473,75 @@ msgstr "Náhled tisku"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Připojení k dict.org pro vyhledávání: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Vyberte elektronickou knihu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Elektronické knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Nenalezena shoda pro: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Načítam tok..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Rozvržení %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Záložka #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Přidat záložku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Zadejte název záložky:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Spravovat záložky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Načítám knihu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Nemohu otevřít eknihu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Volby ke kontrole prohlížeče ebooků"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr "Pokud specifikováno, okno prohlížeče se zobrazí po startu v popředí."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Pokud je zadáno, pokusí se při spuštění otevřít okno prohlížeče na celou "
 "obrazovku."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Tisknout upozornění javascriptu a konzolové zprávy do konzole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13562,27 +13619,27 @@ msgstr "Najít předchozí výskyt"
 msgid "Print eBook"
 msgstr "Vytisknout eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Změnit velikost písmen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Zaměnit malá/velká písmena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Táhněte pro změnu velikosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Zobrazit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Skrýt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Přepínač"
 
@@ -14879,11 +14936,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Nebyl vložen žádný popisek"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14899,15 +14956,15 @@ msgstr "%sPrůměrné hodnocení je %3.1f"
 msgid "Main"
 msgstr "Hlavní"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migruji starou databázi do knihovy ebooků v %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopírování <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Zhutňování databáze"
 
@@ -15991,95 +16048,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Neznámý zdroj zpráv"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Stahování dokončeno"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Nepodařilo se stáhnout následující články:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "Nepodařilo se stáhnout části následujících článků:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " od "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tChybné odkazy:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Stahuji zdroje..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Získány zdroje z úvodní strany"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Pokouším se stáhnout obálku..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Generování tiráže..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Startuji download [%d vláken]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Stáhnout zdroje z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Nemohu stáhnout obálku: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Stahování obálky z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Obrázek z tiráže stažen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Nepojmenovaný článek"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Článek stažen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Stažení článku selhalo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Stahuji feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16087,7 +16144,7 @@ msgstr ""
 "Přihlášení selhalo, zkontrolujte své uživatelské jméno a heslo pro calibre "
 "Novinovou službu."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16471,6 +16528,9 @@ msgstr "Nestahovat kaskádové styly."
 #~ msgid "Separate paragraphs by blank lines."
 #~ msgstr "Oddělit odstavce černými čárami."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nebyl nalezen žádný platný modul v "
+
 #~ msgid "Path to the cover to be used for this book"
 #~ msgstr "Cesta k obálce, která se má použít u této knihy"
 
@@ -17115,9 +17175,6 @@ msgstr "Nestahovat kaskádové styly."
 #~ msgid "Add a directory to the frequently used directories list"
 #~ msgstr "Přidat adresář do seznamu často používaných"
 
-#~ msgid "Toolbar"
-#~ msgstr "Panel nástrojů"
-
 #~ msgid "Select visible &columns in library view"
 #~ msgstr "Viditelné sloup&ce v seznamu knih v knihovne"
 
@@ -18087,6 +18144,9 @@ msgstr "Nestahovat kaskádové styly."
 #~ msgstr ""
 #~ "&Předběžně zpracovat vstupní soubor pro případné zlepšení struktury detekce"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "Rozdělit nástrojovou lištu do dvou lišt."
+
 #~ msgid ""
 #~ "Reset all the author sort values to a value automatically generated from the "
 #~ "author. Exactly how this value is automatically generated can be controlled "
@@ -18454,6 +18514,12 @@ msgstr "Nestahovat kaskádové styly."
 #~ msgid "No errors found"
 #~ msgstr "Nenalezeny žádné chyby"
 
+#~ msgid "Customize searching"
+#~ msgstr "Upravit vyhledávání"
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Upravit panel nástrojů"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Komunikace s Kogan"
 
diff --git a/src/calibre/translations/da.po b/src/calibre/translations/da.po
index 14e2dd8865..61c69317b8 100644
--- a/src/calibre/translations/da.po
+++ b/src/calibre/translations/da.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-12-19 12:26+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: 2011-03-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:42+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Gør absolut ingenting"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Gør absolut ingenting"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Gør absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Gør absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Gør absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Gør absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Gør absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Gør absolut ingenting"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Grund"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Tilpas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Kan ikke konfigurere"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Filtype"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadatalæser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadataskriver"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Kataloggenerator"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Brugergrænseflade aktion"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Indstillinger"
@@ -333,8 +333,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Tilføj/fjern dine egne søjler til calibre boglisten"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Tilpas værktøjslinjen"
+msgid "Toolbar"
+msgstr "Værktøjslinje"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -345,7 +345,7 @@ msgstr ""
 "tilgængelige i hver"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -676,36 +676,32 @@ msgstr "Denne profil er forbeholdt B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Denne profil er beregnet til Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Installerede udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Opsætning af filtype udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Tilpasning af lokalt udvidelsesmodul"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Deaktiverede udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Aktiverede udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Intet gyldigt udvidelsesmodul fundet i "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 "Initialiseringen af udvidelsesmodul %s fejlede med følgende backtrace:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -717,19 +713,19 @@ msgstr ""
 "    Tilpas Calibre ved at indlæse eksterne udvidelsesmoduler.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Tilføj et udvidelsesmodul ved at angive stien til ZIP-filen, hvori det er "
 "gemt."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Fjerner det angivne brugerdefinerede udvidelsesmodul. Har ingen effekt på "
 "indbyggede udvidelser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -737,15 +733,15 @@ msgstr ""
 "Brugertilpasset udvidelsesmodul. Angiv udvidelsesmodulnavn og "
 "tilpasningstekststrenge adskilt af kommaer."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Vis alle installerede udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Aktivér det angivne udvidelsesmodul"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Deaktivér det angivne udvidelsesmodul"
 
@@ -769,43 +765,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Kommunikér med S60 telefoner."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Brug serier som kategori i iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Cache omslag fra iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple enhed"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Kommunikér med iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 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:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -813,27 +821,27 @@ msgstr ""
 "Kan ikke kopiere bøger direkte fra iDevice. Træk fra iTunes-bibliotek til "
 "skrivebord, tilføj herefter til calibres biblioteksvindue."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Opdaterer enhed metadata listen..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d af %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "afsluttet"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -843,7 +851,7 @@ msgstr ""
 "Sletter ved at anvende iBooks app.\n"
 "Klik 'Show Details' for en liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -851,31 +859,31 @@ msgstr ""
 "Nogle omslagsdele kunne ikke konverteres.\n"
 "Klik 'Show Details' for en liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Nyheder"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Kommunikér med iTunes."
 
@@ -919,20 +927,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Henter liste over bøger på enheden..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Overfører bøger til enhed..."
 
@@ -940,8 +948,8 @@ msgstr "Overfører bøger til enhed..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Tilføjer bøger til enhedens metadataliste..."
 
@@ -951,8 +959,8 @@ msgstr "Tilføjer bøger til enhedens metadataliste..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Fjerner bøger fra enhed..."
 
@@ -960,17 +968,17 @@ msgstr "Fjerner bøger fra enhed..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Fjerner bøger fra enhedens metadataliste..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Sender metadata til enhed..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1275,15 +1283,15 @@ msgstr "Kommunikér med Sony PRS-500 e-bogslæser."
 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
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1291,18 +1299,18 @@ 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:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1311,29 +1319,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1468,7 +1487,7 @@ msgstr "Yderligere tilpasning"
 msgid "Communicate with an eBook reader."
 msgstr "Kommunikér med en e-bogslæser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Hent enhedsoplysninger..."
 
@@ -2241,7 +2260,7 @@ msgstr "Konvertér input til HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Udfører transformationer på e-bog..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Opretter"
 
@@ -2392,7 +2411,7 @@ msgstr "Start"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Indsæt ikke indholdsfortegnelse i begyndelse af bogen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2403,6 +2422,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2807,105 +2830,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "TEMPLATE ERROR"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Nej"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Ja"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Forfatter(e)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Udgiver"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Mærker"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Serier"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Sprog"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Tidsstempel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Udgivet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Rettigheder"
 
@@ -3344,7 +3367,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3483,7 +3506,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML indholdsfortegnelse genereringsmuligheder."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3681,6 +3704,7 @@ msgid "Author"
 msgstr "Forfatter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Emne"
 
@@ -3997,136 +4021,140 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 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:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Bekræft før sletning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Arbejdsvindues geometri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 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:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Anvend romertal til serienumre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 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:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 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:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Standardvalg ved konvertering til LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Muligheder for LRF ebook læser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 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:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Kolonner som vises i boglisten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Start automatisk indholdsserver under applikationsopstart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Ældste nyheder gemt i databasen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Vis systembakkeikon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Upload downloadede nyheder til enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 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:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "Vis omslag i et separat vindue, istedet for i calibres arbejdsvindue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Deaktivér adviseringer i systembakkeikonet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 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:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maksimalt antal ventende opgaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Download sociale metadata (mærker/vurderinger/osv.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 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:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Automatisk hent omslaget, hvis tilgængeligt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Begræns maksimal antal samtidige opgaver til CPU kerneantallet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Brugergrænsefladens layout"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 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:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Deaktivér brugergrænseflade animationer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 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:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Vælg filer"
 
@@ -4340,8 +4368,8 @@ msgstr "Kun brugernoter genereret fra arbejdsbibliotek"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Ingen bøger valgt"
@@ -4541,7 +4569,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4609,7 +4637,7 @@ msgid "Bulk convert"
 msgstr "Klynge konvertering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Kan ikke konvertere"
 
@@ -4617,7 +4645,7 @@ msgstr "Kan ikke konvertere"
 msgid "Starting conversion of %d book(s)"
 msgstr "Starter konvertering af %d bog/bøger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "Tom output-fil, sandsynligvis gik konverteringsprocessen ned"
 
@@ -4803,7 +4831,7 @@ msgid "Stop Content Server"
 msgstr "Stop indholdsserver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "E-mail til"
 
@@ -4811,32 +4839,32 @@ msgstr "E-mail til"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Opsætning af e-mail baseseret bogdeling"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Send til enhed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Forbind/del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4923,20 +4951,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Kan ikke redigere metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Kan ikke flette bøger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -4944,7 +4972,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4956,7 +4984,7 @@ msgstr ""
 "og fø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/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4968,7 +4996,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4979,19 +5007,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Hent nyheder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Henter nyheder fra "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " hentet."
 
@@ -5056,7 +5084,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Kør velkommen guide"
 
@@ -5306,7 +5334,7 @@ msgid "The specified directory could not be processed."
 msgstr "Den angivne mappe kunne ikke behandles."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Ingen bøger"
 
@@ -5525,8 +5553,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Sti"
 
@@ -5536,17 +5564,17 @@ msgstr "Sti"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formater"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Samlinger"
 
@@ -5556,25 +5584,25 @@ msgid "Click to open"
 msgstr "Klik for at åbne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Ingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5632,7 +5660,7 @@ msgstr "output"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5655,14 +5683,14 @@ msgstr "output"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6245,10 +6273,14 @@ msgstr "Indsæt ikke en &indholdsfortegnelse i starten af bogen."
 msgid "FB2 Output"
 msgstr "FB2-output"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Skriftstype reskaleringsguide"
@@ -6862,7 +6894,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7466,21 +7498,21 @@ msgstr "Fejl"
 msgid "Error communicating with device"
 msgstr "Kommunikationsfejl med enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Ingen egnede formater"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 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:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Fejl ved kommunikation med enhed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7488,67 +7520,67 @@ 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Enhed: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detekteret."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "valgt til at sende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Vælg format til at sende til enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Ingen enhed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Kan ikke sende: Ingen enhed er forbundet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Intet hukommelseskort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Kan ikke sende: Enheden har intet hukommelseskort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Auto konvertér følgende bøger før upload til enheden?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Sender kataloger til enheden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Sender nyheder til enheden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Sender bøger til enheden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7556,11 +7588,11 @@ 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Ingen plads på enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7862,7 +7894,7 @@ msgstr "Vælg format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -7998,7 +8030,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Annullér"
 
@@ -8047,8 +8079,8 @@ 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:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8080,12 +8112,12 @@ msgid "Author sort"
 msgstr "Forfattersortering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Ugyldigt forfatternavn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Forfatternavne kan ikke indeholde & tegnet."
 
@@ -8278,22 +8310,22 @@ msgid "Working"
 msgstr "Arbejder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Små bogstaver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Store bogstaver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Titel STORE/små bogstaver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Store begyndelsesbogstaver"
 
@@ -9856,12 +9888,12 @@ msgid "%s (was %s)"
 msgstr "%s (var %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Emne er blankt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "Et emne kan ikke sættes til ingenting. Slet det istedet."
 
@@ -9932,7 +9964,7 @@ msgid "Send test mail from %s to:"
 msgstr "Send test e-mail fra %s til:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -10187,62 +10219,62 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Email %s til %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Nyheder:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Som bilag er %s tidsskriftet hentet af calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-bog:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Tilknyttet, vil du finde e-bogen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "af"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "i %s formatet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Sender e-mail til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "Auto konvertér følgende bøger før sending via e-mail?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Emailsending af bog fejlede"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "sendt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Send nyheder til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10256,67 +10288,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Regulært &udtryk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Fil&navn:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Titel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regulært udtryk (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Ingen fund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Forfattere:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Regulært udtryk (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Serier:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regulært udtryk (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Serie-indeks:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regulært udtryk (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regulært udtryk (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "omslags-browser"
@@ -10527,48 +10577,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Redigér skabelon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "På enhed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Størrelse (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Bog %s af %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Opslaget/søgenavn er \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "Denne bogs UUID er \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "I bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Størrelse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Bog <font face=\"serif\">%s</font> af %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Markeret til sletning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dobbeltklik for at <b>redigere</b> mig<br><br>"
 
@@ -10645,7 +10695,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 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:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Ingen søgeresultater fundet"
 
@@ -10662,12 +10712,12 @@ msgid "LRF Viewer toolbar"
 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:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 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:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Forrige side"
 
@@ -11519,19 +11569,26 @@ msgstr "Ændre til &standard"
 msgid "&Remove email"
 msgstr "&Fjern e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Auto send"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "E-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formatér til e-mail. Det første matchende format vil blive sendt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11539,7 +11596,7 @@ 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/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "ny e-mail adresse"
 
@@ -11551,92 +11608,92 @@ msgstr "Smal"
 msgid "Wide"
 msgstr "Bred"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Medium"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Lille"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Stor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Altid"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Aldrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Brugergrænseflade &layout (behøver genstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "&Antal viste omslag i fremviseren (kræver genstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Vælg &sprog (kræver genstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Vis &middelvurderinger i mærkefremviseren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 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/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Deaktivér &animationer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Aktivér s&tatusikon (kræver genstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Vis &startskærm ved opstart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Deaktivér &adviseringer i systembakke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Anvend &romerske tal til serier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 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/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11645,22 +11702,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11670,52 +11727,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Værktøjslinje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Ikonstørrelse:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Vis &tekst under ikoner:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Del værktøjslinjen i to værktøjslinjer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Anvend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Gendan &standardindstillinger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Gem ændringer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Annullér og returnér til oversigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Restoring to defaults not supported for"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11723,7 +11776,7 @@ msgstr ""
 "Nogle af ændringerne du lavede, kræver en programgenstart for at træde i "
 "kraft. Venligst genstart calibre så snart som muligt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11731,7 +11784,7 @@ msgstr ""
 "Ændringerne du har udført, kræver ar calibre skal genstartes nu. Du vil ikke "
 "kunne lave flere ændringer, før du genstarter."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Programgenstart nødvendig"
@@ -12525,30 +12578,34 @@ msgid "The main toolbar"
 msgstr "Hovedværktøjslinjen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Hovedværktøjslinjen når en enhed er forbundet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Kontekstmenuen til bøgerne i calibre-biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Kontekstmenuen til bøgerne i enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Kan ikke tilføje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Kan ikke tilføje aktionerne %s til denne placering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Kan ikke fjerne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Kan ikke fjerne aktionerne %s fra denne placering"
 
@@ -12647,7 +12704,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Søg"
@@ -12740,170 +12797,170 @@ msgstr "Klik for at ændre"
 msgid "&Alternate shortcut:"
 msgstr "&Alternativ genvej:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Gem kategori %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Vis kategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Administrér %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Administrér gemte søgninger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Administrér brugerkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Vis alle kategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Ændring af forfatterne for adskillige bøger kan tage et stykke tid. Er du "
 "sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Ændring af metadataene for adskillige bøger kan tage et stykke tid. Er du "
 "sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Søgninger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Duplikér søgenavn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 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:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12913,61 +12970,61 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Sortér efter navn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Sortér efter popularitet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Sortér efter middelvurdering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Angiv sorteringsrækkefølgen for indgange mærke-browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Match alle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Match enhver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Når flere indgange vælges i mærke-browser, match enhver eller dem alle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Administrér &brugerkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Tilføj dine egne kategorier til mærke-browseren"
 
@@ -13044,23 +13101,23 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Konverteringsfejl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Opskrift deaktiveret"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Fejlede</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13071,11 +13128,11 @@ msgstr ""
 "enheden.<br>\n"
 "                      Er du sikker på at du vil afslutte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13279,7 +13336,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Indstillinger til tilpasning af e-bogsviseren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Husk størrelsen på vinduet"
 
@@ -13360,36 +13417,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Opslag i ordbog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Gå til..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Næste sektion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Forrige sektion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Dokument start"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Dokument slut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Sektion start"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Sektion slut"
 
@@ -13466,75 +13523,75 @@ msgstr "Forhåndsvisning af udskrift"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Forbinder til dict.org for opslag: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Vælg e-bog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "E-bøger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Ingen match fundet for: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Henter flow..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Udlægning %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Bogmærke #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Tilføj bogmærke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Indtast bogmærketitel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Administrér bogmærker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Henter e-bog..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Kunne ikke åbne e-bog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Valg til at styre e-bogsviser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 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:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Hvis angivet, vil oversigtsvindue prøve at åbne i fuld skærm under start."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Udskriv javascript alert og konsol beskeder til konsolen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13612,27 +13669,27 @@ msgstr "Find forrige forekomst"
 msgid "Print eBook"
 msgstr "Udskriv e-bog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Skift versaltype"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Skift store/små bogstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Træk til skaléring"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Vis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Skjul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Skift"
 
@@ -15056,11 +15113,11 @@ msgstr ""
 "\n"
 "For hjælp om de enkelte kommandoer: %%prog kommando --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Intet mærke blev angivet"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15076,15 +15133,15 @@ msgstr "%sMiddel vurderingen er %3.1f"
 msgid "Main"
 msgstr "Main/hjem/primær"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 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:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopierer <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Komprimerer database"
 
@@ -16179,95 +16236,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Ukendt nyhedskilde"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "\"%s\"-opskriften kræver et brugernavn og adgangskode."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Download afsluttet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Kunne ikke downloade følgende artikler:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " fra "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tMislykkede henvisninger:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Henter feeds..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Fik feeds fra indekssiden"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Prøver at downloade omslag..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Genererer masthead..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Starter download [%d tråd(e)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Feeds er hentet til %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Kunne ikke hente omslaget: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Downloader omslag fra %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Masthead billede downloadet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Unavngiven artikel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artikel hentet: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Hentning af artikel mislykkedes: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Henter feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16275,7 +16332,7 @@ msgstr ""
 "Login mislykkedes, check dit brugernavn og adgangskode til calibre "
 "tidsskriftsservice."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17618,9 +17675,6 @@ msgstr "Download ikke CSS-stilark"
 #~ msgid "Add a directory to the frequently used directories list"
 #~ msgstr "Føjer en mappe til listen over hyppigt brugte mapper"
 
-#~ msgid "Toolbar"
-#~ msgstr "Værktøjslinje"
-
 #~ msgid "calibre can send your books to you (or your reader) by email"
 #~ msgstr "calibre kan sende dine bøger til dig (eller din læser) via e-mail"
 
@@ -18571,6 +18625,9 @@ msgstr "Download ikke CSS-stilark"
 #~ "    Valg styrer hvordan indgange vises i den genererede katalog-output.\n"
 #~ "    "
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Intet gyldigt udvidelsesmodul fundet i "
+
 #~ msgid "Choose plugin"
 #~ msgstr "Vælg udvidelsesmodul"
 
@@ -18910,6 +18967,9 @@ msgstr "Download ikke CSS-stilark"
 #~ msgid "Tags to apply when adding a book:"
 #~ msgstr "Mærker som skal anvendes, når en ny bog tilføjes:"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Tilpas værktøjslinjen"
+
 #~ msgid "Read metadata from &file contents rather than file name"
 #~ msgstr "Læs metadata fra &filindhold i stedet for filnavn"
 
@@ -18926,6 +18986,9 @@ msgstr "Download ikke CSS-stilark"
 #~ msgid "Test re&sult"
 #~ msgstr "Test re&sultat"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Del værktøjslinjen i to værktøjslinjer"
+
 #~ msgid "Apply function &after replace:"
 #~ msgstr "Anvend funktion &efter erstat:"
 
diff --git a/src/calibre/translations/de.po b/src/calibre/translations/de.po
index 3bd0fda637..239c0d772b 100644
--- a/src/calibre/translations/de.po
+++ b/src/calibre/translations/de.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-04 14:25+0000\n"
 "Last-Translator: miwie <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: 2011-03-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:44+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Macht absolut gar nichts"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -33,7 +33,7 @@ msgstr "Macht absolut gar nichts"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -50,9 +50,9 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -72,7 +72,7 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -118,19 +118,19 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -138,12 +138,12 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -154,11 +154,11 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -172,46 +172,46 @@ msgstr "Macht absolut gar nichts"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Basis"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Anpassen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Konfiguration nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Dateityp"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadaten lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadaten schreiben"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalogerstellung"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Benutzeroberflächenaktion"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -334,8 +334,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Hinzufügen/Entfernen eigener Spalten in der Calibre Buchliste"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Werkzeugleiste anpassen"
+msgid "Toolbar"
+msgstr "Symbolleiste"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -344,8 +344,8 @@ msgid ""
 msgstr "Passt individuell Werkzeugleiste und Kontextmenus an."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Suche anpassen"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -683,35 +683,31 @@ msgstr "Dieses Profil ist geeignet für den B&N Nook Color"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Dieses Profil ist geeignet für den Sanda Bambook"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Installierte Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapping für Dateityp-Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Lokale Plugin-Anpassung"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Ausgeschaltene Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Aktivierte Module"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Kein gültiges Plugin gefunden in "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -723,19 +719,19 @@ msgstr ""
 "    Calibre anpassen durch das Laden externer Plugins.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -743,15 +739,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:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Installierte Plugins auflisten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Gewähltes Plugin einschalten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Gewähltes Plugin ausschalten"
 
@@ -775,43 +771,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Kommunikation mit S60-Telefonen."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Verwende Reihen als Kategorien in iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Umschlagbilder von iTunes/iBooks zwischenspeichern"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple- Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Kommunikation mit iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Gerät von Apple entdeckt, starte iTunes, einen Moment bitte..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -819,27 +827,27 @@ msgstr ""
 "Kann Bücher nicht direkt vom iDevice kopieren. Ziehen Sie sie aus der iTunes "
 "Bibliothek auf den Desktop, fügen Sie sie dann Calibres Bibliothek hinzu."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Aktualisiere die Liste der Geräte-Metadaten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d von %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "abgeschlossen"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -849,7 +857,7 @@ msgstr ""
 "Zum Löschen die iBooks App verwenden.\n"
 "Klicken Sie 'Zeige Details' für eine Liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -857,31 +865,31 @@ msgstr ""
 "Einige Umschlagbilder konnten nicht konvertiert werden.\n"
 "Klicken Sie 'Zeige Details' für eine Liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Nachrichten"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Kommunikation mit iTunes."
 
@@ -933,20 +941,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 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/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Bücher ans Gerät übertragen ..."
 
@@ -954,8 +962,8 @@ msgstr "Bücher ans Gerät übertragen ..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Bücher zur Metadaten-Liste des Geräts hinzufügen ..."
 
@@ -965,8 +973,8 @@ msgstr "Bücher zur Metadaten-Liste des Geräts hinzufügen ..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Bücher vom Gerät entfernen ..."
 
@@ -974,17 +982,17 @@ msgstr "Bücher vom Gerät entfernen ..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 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/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Metadaten ans Gerät senden ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK ist nicht installiert."
 
@@ -1290,15 +1298,15 @@ msgstr "Kommunikation mit dem Sony PRS-500 eBook Reader."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Kommunikation mit allen Sony eBook Readern."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "nach Titel"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Alle nach Titel"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1306,7 +1314,7 @@ msgstr ""
 "Mit Kommata getrennte Liste von Metadatenfeldern um Büchersammlungen auf dem "
 "Gerät zu erstellen. Möglichkeiten sind: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1316,11 +1324,11 @@ msgstr ""
 "Werte zur Liste hinzu, um sie zu aktivieren. Die Sammlungen erhalten den "
 "nach dem Doppelpunkt \":\" stehenden Namen."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Separaten Cover-Thumbnail für Bücher überspielen (neuere Reader)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1334,14 +1342,14 @@ msgstr ""
 "nicht geändert werden kann. ACHTUNG: Diese Option sollte nur mit neuer "
 "Readern genutzt werden: 350, 650, 950 und neuer."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Aktualisiere separate Cover wenn automatisches Management genutzt wird "
 "(neuere Reader)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1351,17 +1359,28 @@ msgstr ""
 "separaten Cover zu übertragen. Deaktivieren sie diese Option wenn sie so "
 "viele Bücher auf ihrem Reader haben das die Performance inakzeptabel wird."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1501,7 +1520,7 @@ msgstr "Besondere Anpassung"
 msgid "Communicate with an eBook reader."
 msgstr "Kommunikation mit einem eBook Reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Geräte-Information beziehen ..."
 
@@ -2329,7 +2348,7 @@ msgstr "Eingabe zu HTML konvertieren ..."
 msgid "Running transforms on ebook..."
 msgstr "Veränderungen am eBook durchführen ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Erstellen"
 
@@ -2488,7 +2507,7 @@ msgstr "Start"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Kein Inhaltsverzeichnis am Anfang des Buches einfügen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2507,6 +2526,10 @@ msgstr ""
 "\"Inhaltsverzeichnis\"- Einstellungen an (aktivieren Sie \"Verwendung des "
 "automatisch erstellen Inhaltsverzeichnisses erzwingen\")."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2917,105 +2940,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "Vorlagenfehler"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Nein"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Ja"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produzent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Bemerkung"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiketten (Tags)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Reihe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Sprache"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Rechte"
 
@@ -3462,7 +3485,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3600,7 +3623,7 @@ msgid "HTML TOC generation options."
 msgstr "Einstellungen zur Erstellung von HTML-Inhaltsverzeichnissen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3806,6 +3829,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Thema"
 
@@ -4130,74 +4154,78 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Datei auf die Speicherkarte anstatt in den Hauptspeicher des Gerätes "
 "(Voreinstellung) senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Bestätigung vor dem Löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Aufteilung des Hauptfensters"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Benachrichtigen, wenn eine neue Version verfügbar ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Benutze römische Ziffern für Reihennummerierung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Etikettenliste nach Name, Beliebtheit oder Bewertung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Anzahl der Umschlagbilder, die im Cover-Ansicht Modus angezeit werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Voreinstellungen für Konvertierung zu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Optionen für den LRF eBook Viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formate, die mithilfe des internen Viewers angesehen werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Spalten, die in der Liste der Bücher angezeigt werden sollen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Content Server automatisch beim Aufrufen von Calibre starten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Älteste in der Datenbank gespeicherte Nachrichten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Symbol im Systembereich der Kontrollleiste anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Geladene Nachrichten auf das Gerät übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Bücher nach der Übertragung auf das Gerät aus der Bibliothek löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4205,70 +4233,70 @@ msgstr ""
 "Zeige Cover-Ansicht in einem eigenen Fenster anstatt im Hauptfenster von "
 "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 "Benachrichtigungen aus dem Systembereich der Kontrollleiste deaktivieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Voreingestellte Übertragungsart beim Verwenden der \"An Reader übertragen\" "
 "Schaltfläche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maximale Anzahl der Arbeitsprozesse in der Warteschlange"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Soziale Metadaten (Etikettierung/Bewertung/etc.) laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Autor und Titel mit neuen Metadaten überschreiben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Läd das Cover, wenn möglich, automatisch herunter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 "Maximale Anzahl gleichzeitiger Aufträge auf die Anzahl der CPUs beschränken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Das Aussehen der Benutzeroberfläche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 "Durchschnittsbewertungsindikator pro Einheit im Etikettenbrowser anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Keine Benutzeroberflächen-Animationen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "Etiketten-Browser Kategorien nicht anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Dateien wählen"
 
@@ -4486,8 +4514,8 @@ msgstr "Nur aus der Hauptbibliothek erstellte Benutzeranmerkungen"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Keine Bücher ausgewählt"
@@ -4688,7 +4716,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4760,7 +4788,7 @@ msgid "Bulk convert"
 msgstr "Auf einmal konvertieren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Konvertierung nicht möglich"
 
@@ -4768,7 +4796,7 @@ msgstr "Konvertierung nicht möglich"
 msgid "Starting conversion of %d book(s)"
 msgstr "Starte Konvertierung von %d Büchern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "Leere Ausgabedatei, eventuell ist der Umwandlungsprozess abgestürzt"
 
@@ -4959,7 +4987,7 @@ msgid "Stop Content Server"
 msgstr "Content Server beenden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "eMail an"
 
@@ -4967,32 +4995,32 @@ msgstr "eMail an"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Richtet den Email- Versand von Büchern ein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "G"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "An Reader übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Verbinden/Teilen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -5081,20 +5109,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Kann Metadaten nicht bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Konnte Bücher nicht zusammenfügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5102,7 +5130,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5115,7 +5143,7 @@ msgstr ""
 "gelöscht oder verändert.<br><br>Bestätigen Sie bitte, dass Sie fortfahren "
 "möchten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5127,7 +5155,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5138,19 +5166,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Nachrichten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Rufe Nachrichten ab von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " abgerufen."
 
@@ -5215,7 +5243,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Willkommens-Assistenten ausführen"
 
@@ -5470,7 +5498,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:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Keine Bücher"
 
@@ -5691,8 +5719,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Pfad"
 
@@ -5702,17 +5730,17 @@ msgstr "Pfad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Sammlungen"
 
@@ -5722,25 +5750,25 @@ msgid "Click to open"
 msgstr "Zum Öffnen klicken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Keine"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5798,7 +5826,7 @@ msgstr "Ausgabe"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5821,14 +5849,14 @@ msgstr "Ausgabe"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6415,10 +6443,14 @@ msgstr "Kein Inhal&tsverzeichnis am Anfang des Buches einfügen."
 msgid "FB2 Output"
 msgstr "FB2-Ausgabe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Sektionieren:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Schriftskalierungs-Assistent"
@@ -7039,7 +7071,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7647,21 +7679,21 @@ msgstr "Fehler"
 msgid "Error communicating with device"
 msgstr "Fehler bei der Kommunikation mit dem Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Keine geeigneten Formate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Verzeichnis wählen, das als Gerät geöffnet werden soll"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Fehler in der Kommunikation zum Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7669,68 +7701,68 @@ msgstr ""
 "Es trat ein Fehler in der Kommunikation mit dem Gerät auf. Bitte entfernen "
 "und schließen Sie das Gerät wieder an und - oder starten Sie neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Gerät: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "zum Übertragen ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 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:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Kein Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Übertragung schlug fehl: Kein Gerät verbunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Keine Speicherkarte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Sende Kataloge ans Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Sende Nachrichten an das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Sende Bücher an das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7739,11 +7771,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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Gerätespeicher voll"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -8045,7 +8077,7 @@ msgstr "Format wählen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -8183,7 +8215,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Abbruch"
 
@@ -8232,8 +8264,8 @@ msgid "Location"
 msgstr "Ort"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8265,12 +8297,12 @@ msgid "Author sort"
 msgstr "Autorensortierung"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Ungültiger Autorenname"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Autorennamen dürfen nicht das Zeichen & enthalten."
 
@@ -8467,22 +8499,22 @@ msgid "Working"
 msgstr "Bei der Arbeit..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Kleinschreibung"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Großschreibung"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Wortanfänge groß schreiben"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Großschreiben"
 
@@ -10085,12 +10117,12 @@ msgid "%s (was %s)"
 msgstr "%s (war %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Eintrag ist leer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 "Ein Element kann nicht auf nichts eingestellt werden. Löschen Sie es "
@@ -10164,7 +10196,7 @@ msgid "Send test mail from %s to:"
 msgstr "Test eMail senden von %s an:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -10420,63 +10452,63 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Schicke %s an %s via Email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Nachrichten:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Im Anhang ist das Magazin %s, von Calibre heruntergeladen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "eBook:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Im Anhang finden Sie das eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "von"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "im %s Format."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Sende eMail an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 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/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Emailversand des Buches fehlgeschlagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "versendet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Nachrichten senden an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10490,67 +10522,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "R&egulärer Ausdruck"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Datei&name:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Titel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regulärer Ausdruck (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Kein Treffer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autoren:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Regulärer Ausdruck (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Reihen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regulärer Ausdruck (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Reihen Index:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regulärer Ausdruck (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regulärer Ausdruck (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Cover-Browser"
@@ -10763,48 +10813,48 @@ msgstr "J"
 msgid "Edit template"
 msgstr "Vorlage bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Auf dem Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Größe (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Buch %s von %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Der Such-Name ist \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "Die UUID dieses Buches ist \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "In der Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Größe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Zum Löschen ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doppelklick ermöglicht <b>Bearbeitung</b><br><br>"
 
@@ -10881,7 +10931,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Keine Treffer</b> für die Suchworte <i>%s</i> gefunden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Keine Treffer gefunden"
 
@@ -10898,12 +10948,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF Viewer Symbolleiste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Nächste Seite"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Vorherige Seite"
 
@@ -11771,19 +11821,26 @@ msgstr "Als Voreinstellung verwenden"
 msgid "&Remove email"
 msgstr "eMail entfe&rnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Automatisches Übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "eMail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formate für eMail. Das erste passende Format wird versendet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11792,7 +11849,7 @@ msgstr ""
 "Adresse versendet (vorausgesetzt sie entspricht einem der angegebenen "
 "Formate)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "Neue eMail-Adresse"
 
@@ -11804,95 +11861,95 @@ msgstr "Schmal"
 msgid "Wide"
 msgstr "Breit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Mittel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Groß"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Immer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Aussehen der Benutzeroberf&läche (Neustart erforderlich):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wäh&len (erfordert Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Zeige durchschnittliche &Bewertungen im Etiketten-Browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Alle Animationen ausschalten. Hilfreich bei langsamen/alten Rechnern."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Animationen &ausschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Symbol im Sys&tembereich der Kontrollleiste aktivieren (erfordert Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Spla&sh-Screen beim Starten anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "&Benachrichtigungen im Systemtray deaktivieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "&Römische Zahlen für Serien verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 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/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11901,22 +11958,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11926,52 +11983,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "Symbolleis&te"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Symbolgröße:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "&Text unter Symbolen anzeigen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Werkzeugleiste in zwei Leisten teilen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Interface-Schriftart:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Ändere &font (Neustart erforderlich)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Anwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Voreinstellungen wie&derherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Abbrechen und zur Übersicht zurückkehren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Voreinstellungen wiederherstellen wird nicht unterstützt für"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11979,7 +12032,7 @@ msgstr ""
 "Einige Ihrer Änderungen erfordern einen Neustart. Bitte starten Sie Calibre "
 "so bald wie möglich neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11987,7 +12040,7 @@ msgstr ""
 "Ihre Änderungen erfordern einen sofortigen Neustart von Calibre. Sie können "
 "keine Einstellungen mehr ändern, bevor Sie neu starten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Neustart erforderlich"
@@ -12791,30 +12844,34 @@ msgid "The main toolbar"
 msgstr "Die Haupt- Werkzeugsleiste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Die Haupt- Werkzeugsleiste bei verbundenem Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Kontextmenü für Bücher in der Calibre Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Kontextmenü für Bücher auf dem Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Hinzufügen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Kann die Aktionen %s nicht an diesem Ort hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Entfernen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Kann die Aktionen %s nicht von diesem Ort entfernen"
 
@@ -12914,7 +12971,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Suche"
@@ -13008,170 +13065,170 @@ msgstr "Klicken zum Verändern"
 msgid "&Alternate shortcut:"
 msgstr "&Alternatives Tastenkürzel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Kategorie %s ausblenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Kategorie anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "%s verwalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Gespeicherte Suchen verwalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Benutzer-Kategorien verwalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Alle Kategorien anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Das Ändern der Autoren für mehrere Bücher kann einige Zeit dauern. Sind Sie "
 "sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Das Ändern der Metadaten für so viele Bücher kann einige Zeit dauern. Sind "
 "Sie sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Suchergebnisse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Such-Name duplizieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "Der gespeicherte Such-Name %s wird schon verwendet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13181,51 +13238,51 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Nach Name sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Nach Beliebtheit sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Nach Bewertungsdurchschnitt sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Reihenfolge der Einträge im Etiketten- Browser einstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Übereinstimmung mit allen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Übereinstimmung mit irgendeinem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
@@ -13233,11 +13290,11 @@ msgstr ""
 "entweder Bücher, bei denen mindestens ein Eintrag paßt, oder aber Bücher, "
 "bei denen alle Einträge passen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Ben&utzer-Kategorien verwalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Eigene Kategorien zum Etiketten- Browser hinzufügen"
 
@@ -13316,24 +13373,24 @@ msgstr ""
 "Sie haben Calibre im Debug-Modus gestartet. Beim verlassen des Programms "
 "wird ein Debug-Log erstellt: %s<p>Das Log wird automatisch angezeigt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Downloadschema ausgeschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Misslungen</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13344,11 +13401,11 @@ msgstr ""
 "verursachen.<br>\n"
 "                      Sind Sie sicher, dass sie beenden möchten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13557,7 +13614,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Einstellungen zum Anpassen des eBook Viewers"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Zuletzt verwendete Fenstergröße merken"
 
@@ -13639,36 +13696,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "Im Wörterbuch nachsch&lagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Gehe zu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Nächster Abschnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Vorheriger Abschnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Beginn des Dokuments"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Ende des Dokuments"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Beginn des Abschnitts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Ende des Abschnitts"
 
@@ -13746,77 +13803,77 @@ msgstr "Druckvorschau"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Verbinde mit dict.org zum Nachschlagen von: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "eBook wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Keine Treffer gefunden für: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Lade Ablauf..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Lege %s an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "#%d zu Lesezeichen hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Lesezeichen hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Titel für Lesezeichen eingeben:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Lesezeichen verwalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Lade eBook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Konnte eBook nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Einstellungen zur Kontrolle des eBook Viewers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Falls angegeben, dann wird das Viewer Fenster beim Start im Vordergrund "
 "angezeigt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Wenn ausgewählt, wird das Betrachter- Fenster nach Möglichkeit im "
 "Vollbildmodus geöffnet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Javascript Alarme und Konsolennachrichten auf der Konsole ausgeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13894,27 +13951,27 @@ msgstr "Finde vorherige Stelle"
 msgid "Print eBook"
 msgstr "eBook drucken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Groß-/Kleinschreibung ändern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Groß-/Kleinschreibung vertauschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Zur Größenänderung ziehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Ausblenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Umschalten"
 
@@ -15360,11 +15417,11 @@ msgstr ""
 "\n"
 "Sie erhalten Hilfe zu einem bestimmten Befehl mit: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Kein Suchname angegeben"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15380,15 +15437,15 @@ msgstr "%sdie durchschnittliche Bewertung ist %3.1f"
 msgid "Main"
 msgstr "Haupt"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migriere alte Datenbank zu eBook Bibliothek in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopiere <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Komprimiere Datenbank"
 
@@ -16493,96 +16550,96 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Nachrichtenquelle unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Download beendet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " von "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tFehlgeschlagene Verknüpfungen:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Rufe Feeds ab..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Feeds der Index-Seite erhalten"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Umschlagbild versuchen herunterzuladen ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Erstelle Impressum..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Download von [%d Thread(s)] starten ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Feeds wurden nach %s heruntergeladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Umschlagbild konnte nicht heruntergeladen werden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Umschlagbild von %s herunterladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Impressumskopie geladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Artikel ohne Titel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artikel heruntergeladen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Herunterladen der Artikel schlug fehl: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Feed abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16590,7 +16647,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17420,9 +17477,6 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ "Option außer Gebrauch und wird bevorzugt behandelt. Um --font-delta zu "
 #~ "benutzen, geben Sie 0 an. Voreinstellung: %defaultpt"
 
-#~ msgid "Toolbar"
-#~ msgstr "Symbolleiste"
-
 #~ msgid "Show &text in toolbar buttons"
 #~ msgstr "Zeige &Text in Schaltflächen der Symbolleiste"
 
@@ -18212,6 +18266,9 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgid "Output:"
 #~ msgstr "Ausgabe:"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Kein gültiges Plugin gefunden in "
+
 #~ msgid " plugins"
 #~ msgstr " Plugins"
 
@@ -20534,6 +20591,9 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgstr ""
 #~ "Sie können die Bibliotheken nicht wechseln, wenn ein Gerät angeschlossen ist."
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Werkzeugleiste anpassen"
+
 #~ msgid "Apply function &after replace:"
 #~ msgstr "Funktion n&ach Ersetzung anwenden:"
 
@@ -20728,6 +20788,9 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ " Die rote Farbe zeigt an, dass die derzeitige Sortierung nach Autor nicht "
 #~ "mit dem Autor übereinstimmt"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Werkzeugleiste in zwei Leisten teilen"
+
 #~ msgid ""
 #~ "Values for the tweaks are shown below. Edit them to change the behavior of "
 #~ "calibre. Your changes will only take effect after a restart of calibre."
@@ -20978,3 +21041,6 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 
 #~ msgid "The integrity check completed with no uncorrectable errors found."
 #~ msgstr "Die Integritätsüberprüfung wurde ohne unbehebbare Fehler beendet."
+
+#~ msgid "Customize searching"
+#~ msgstr "Suche anpassen"
diff --git a/src/calibre/translations/el.po b/src/calibre/translations/el.po
index 7a650cdb41..2bc76d5472 100644
--- a/src/calibre/translations/el.po
+++ b/src/calibre/translations/el.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-04 12:33+0000\n"
 "Last-Translator: cosmix <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:44+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Δεν κάνει τίποτα"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Δεν κάνει τίποτα"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Δεν κάνει τίποτα"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Δεν κάνει τίποτα"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Δεν κάνει τίποτα"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Δεν κάνει τίποτα"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Δεν κάνει τίποτα"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Δεν κάνει τίποτα"
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Βάση"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Προσαρμογή"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Δεν μπορεί να ρυθμιστεί"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Τύπος αρχείου"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Αναγνώστης μεταδεδομένων"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Εγγραφέας μεταδεδομένων"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Δημιουργία καταλόγου"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Ενέργεια Περιβάλλοντος Εργασίας"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Προτιμήσεις"
@@ -339,8 +339,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Προσθαφαίρεση στηλών στον κατάλογο βιβλίων του calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Παραμετροποίηση γραμμής εντολών"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -349,8 +349,8 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Προσαρμογή αναζήτησης"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -678,35 +678,31 @@ msgstr "Προφίλ για χρήση με το B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Προφίλ για χρήση με το Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Εγκατεστημένα πρόσθετα"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Απεικόνιση για πρόσθετα αρχειοτύπων"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Τοπική εξατομίκευση προσθέτων"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Απενεργοποιημένα πρόσθετα"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Ενεργοποιημένα πρόσθετα"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Δεν βρέθηκε έγκυρο πρόσθετο "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Η αρχικοποίηση του πρόσθετου %s απέτυχε με traceback:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -718,19 +714,19 @@ msgstr ""
 "    Εξατομίκευση του calibre με φόρτωση εξωτερικών προσθέτων.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Προσθήκη ενός προσθέτου με προσδιορισμό της διεύθυνσης (path) του αρχείου "
 "zip που το περιέχει."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Αφαίρεση εξατομικευμένων προσθέτων, ονομαστικά. Δεν επηρεάζει τα "
 "ενσωματωμένα πρόσθετα"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -738,15 +734,15 @@ msgstr ""
 "Εξατομίκευση προσθέτου. Προσδιόρισε όνομα προσθέτου και στοιχειοσειρά "
 "εξατομίκευσης χωρισμένα με κόμμα."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Εμφάνιση όλων των εγκατεστημένων πρόσθετων"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Ενεργοποίηση του ονομαζόμενου προσθέτου"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Απενεργοποίηση του ονομαζόμενου προσθέτου"
 
@@ -770,106 +766,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Επικοινωνία με τηλέφωνα S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Συσκευή Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Επικοινωνία με iTunes/iBook"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Συσκευή της Apple εντοπίστηκε, έναρξη iTunes, παρακαλώ περιμένετε..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Ενημέρωση καταλόγου μεταδεδομένων της συσκευής"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d από %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "ολοκληρώθηκε"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Νέα"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Κατάλογος"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Επικοινωνία με το iTunes"
 
@@ -913,20 +921,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Λήψη καταλόγου των βιβλίων στη συσκευή..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Μεταφορά βιβλίων στη συσκευή..."
 
@@ -934,8 +942,8 @@ msgstr "Μεταφορά βιβλίων στη συσκευή..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Προσθήκη βιβλίων στον κατάλογο μεταδεδομένων της συσκευής..."
 
@@ -945,8 +953,8 @@ msgstr "Προσθήκη βιβλίων στον κατάλογο μεταδεδ
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Αφαίρεση βιβλίων από τη συσκευή..."
 
@@ -954,17 +962,17 @@ msgstr "Αφαίρεση βιβλίων από τη συσκευή..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Αφαίρεση βιβλίων από τον κατάλογο μεταδεδομένων της συσκευής..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Αποστολή μεταδεδομένων στη συσκευή..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1263,15 +1271,15 @@ msgstr "Επικοινωνία με το ηλ.αναγνωστήριο Sony PRS-
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Επικοινωνία με όλα τα Sony eBook reader"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1279,18 +1287,18 @@ msgstr ""
 "Κατάλογος πεδίων μεταδεδομένων, χωρισμένων με κόμμα, στη συσκευή, προς "
 "μετατροπή σε συλλογές. Οι πιθανότητες συμπεριλαμβάνουν: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1299,29 +1307,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1456,7 +1475,7 @@ msgstr "Πρόσθετη εξατομίκευση"
 msgid "Communicate with an eBook reader."
 msgstr "Επικοινωνία με ένα ηλ.αναγνωστήριο."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Λήψη των στοιχείων της συσκευής"
 
@@ -2212,7 +2231,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Δημιουργία"
 
@@ -2327,7 +2346,7 @@ msgstr "Έναρξη"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2338,6 +2357,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2691,105 +2714,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Όχι"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Ναι"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Εκδότης"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Δικαιώματα"
 
@@ -3172,7 +3195,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3305,7 +3328,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3471,6 +3494,7 @@ msgid "Author"
 msgstr "Συγγραφέας"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Θέμα"
 
@@ -3735,135 +3759,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Εμφάνιση εικονιδίου πλαισίου συστήματος"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -4071,8 +4099,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4269,7 +4297,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4335,7 +4363,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4343,7 +4371,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4524,7 +4552,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4532,32 +4560,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4644,26 +4672,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4671,7 +4699,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4683,7 +4711,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4694,19 +4722,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4771,7 +4799,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -5013,7 +5041,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5215,8 +5243,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Διαδρομή"
 
@@ -5226,17 +5254,17 @@ msgstr "Διαδρομή"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Λίστα φορμάτ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Συλλογές"
 
@@ -5246,25 +5274,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Κανένα"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5322,7 +5350,7 @@ msgstr "έξοδος"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5345,14 +5373,14 @@ msgstr "έξοδος"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5917,10 +5945,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6512,7 +6544,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Έλεγχος"
 
@@ -7097,97 +7129,97 @@ msgstr "Σφάλμα"
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Συσκευή: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7473,7 +7505,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Μορφοποίηση"
 
@@ -7609,7 +7641,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7656,8 +7688,8 @@ msgid "Location"
 msgstr "Τοποθεσία"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7689,12 +7721,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7878,22 +7910,22 @@ msgid "Working"
 msgstr "Σε εργασία"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Πεζά"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Κεφαλαία"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Κεφαλαία/Πεζά Τίτλου"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9373,12 +9405,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9447,7 +9479,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Δοκιμή"
 
@@ -9682,61 +9714,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "από"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9750,67 +9782,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Κανονική έ&κφραση"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Δεν υπάρχει αντιστοιχία"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Συγγραφείς:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10018,48 +10068,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Μέγεθος (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10134,7 +10184,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Δεν βρέθηκαν αντιστοιχίες."
 
@@ -10151,12 +10201,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Επόμενη Σελίδα"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Προηγούμενη Σελίδα"
 
@@ -10962,25 +11012,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Ηλεκ. αλληλογραφία"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10992,91 +11049,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Μεσαίο"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Μικρό"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Μεγάλο"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Πάντα"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Ποτέ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11085,22 +11142,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11110,64 +11167,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "Γραμμή &εργαλείων"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11898,30 +11951,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12018,7 +12075,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Αναζήτηση"
@@ -12111,166 +12168,166 @@ msgstr "Κλικ για αλλαγή"
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Αναζητήσεις"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12280,60 +12337,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Ταξινόμηση κατά όνομα"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12406,34 +12463,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12633,7 +12690,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12711,36 +12768,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Μετάβαση στο..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Επόμενο τμήμα"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Προηγούμενο τμήμα"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12816,73 +12873,73 @@ msgstr "Προεπισκόπηση Εκτύπωσης"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Προσθήκη σελιδοδείκτη"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Διαχείριση Σελιδοδεικτών"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12957,27 +13014,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Εναλλαγή Κεφαλαία-Μικρά"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Εμφάνιση"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Απόκρυψη"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Εναλλαγή"
 
@@ -14143,11 +14200,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14161,15 +14218,15 @@ msgstr ""
 msgid "Main"
 msgstr "Κύριο"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Συμπίεση βάσης δεδομένων"
 
@@ -15206,101 +15263,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Η λήψη τελείωσε"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15410,6 +15467,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Δεν βρέθηκε έγκυρο πρόσθετο "
+
 #~ msgid "Communicate with the Nokia 810 internet tablet."
 #~ msgstr "Επικοινωνία με το Nokia 810 internet tablet."
 
@@ -15532,3 +15592,9 @@ msgstr ""
 
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Επικοινωνία με το Kogan"
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Παραμετροποίηση γραμμής εντολών"
+
+#~ msgid "Customize searching"
+#~ msgstr "Προσαρμογή αναζήτησης"
diff --git a/src/calibre/translations/en_AU.po b/src/calibre/translations/en_AU.po
index 98b7c38d17..69931156a3 100644
--- a/src/calibre/translations/en_AU.po
+++ b/src/calibre/translations/en_AU.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-05-21 07:30+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@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: 2011-03-27 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:54+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/en_CA.po b/src/calibre/translations/en_CA.po
index 4e1de24f84..f9e52cbea5 100644
--- a/src/calibre/translations/en_CA.po
+++ b/src/calibre/translations/en_CA.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-02-27 02:43+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: English (Canada) <en_CA@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: 2011-03-27 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:54+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Does absolutely nothing"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Does absolutely nothing"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Does absolutely nothing"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "File type"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadata reader"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadata writer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -328,7 +328,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -338,7 +338,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -649,35 +649,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Installed plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapping for filetype plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Local plugin customization"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Disabled plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "No valid plugin found in "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Initialization of plugin %s failed with traceback:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -685,15 +681,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Add a plugin by specifying the path to the zip file containing it."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Remove a custom plugin by name. Has no effect on built-in plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -701,15 +697,15 @@ msgstr ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "List all installed plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Enable the named plugin"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Disable the named plugin"
 
@@ -733,106 +729,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "News"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -876,20 +884,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Getting list of books on device…"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Transferring books to device…"
 
@@ -897,8 +905,8 @@ msgstr "Transferring books to device…"
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Adding books to device metadata listing…"
 
@@ -908,8 +916,8 @@ msgstr "Adding books to device metadata listing…"
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Removing books from device…"
 
@@ -917,17 +925,17 @@ msgstr "Removing books from device…"
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Removing books from device metadata listing…"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Sending metadata to device…"
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1226,15 +1234,15 @@ msgstr "Communicate with the Sony PRS-500 eBook reader."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1242,18 +1250,18 @@ msgstr ""
 "Comma-separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1262,29 +1270,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1417,7 +1436,7 @@ msgstr "Extra customization"
 msgid "Communicate with an eBook reader."
 msgstr "Communicate with an eBook reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Get device information…"
 
@@ -2098,7 +2117,7 @@ msgstr "Converting input to HTML…"
 msgid "Running transforms on ebook..."
 msgstr "Running transforms on ebook…"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Creating"
 
@@ -2221,7 +2240,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Do not insert a Table of Contents at the beginning of the book."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2232,6 +2251,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2606,105 +2629,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Title"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Publisher"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3087,7 +3110,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3220,7 +3243,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3386,6 +3409,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3650,135 +3674,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3986,8 +4014,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4184,7 +4212,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4250,7 +4278,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4258,7 +4286,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4439,7 +4467,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4447,32 +4475,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4559,26 +4587,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4586,7 +4614,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4598,7 +4626,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4609,19 +4637,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4686,7 +4714,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4928,7 +4956,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5130,8 +5158,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5141,17 +5169,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5161,25 +5189,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5237,7 +5265,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5260,14 +5288,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5832,10 +5860,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6427,7 +6459,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -7012,97 +7044,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7388,7 +7420,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7524,7 +7556,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7571,8 +7603,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7604,12 +7636,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7793,22 +7825,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9288,12 +9320,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9362,7 +9394,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9597,61 +9629,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9665,67 +9697,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9933,48 +9983,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10049,7 +10099,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10066,12 +10116,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10877,25 +10927,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10907,91 +10964,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11000,22 +11057,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11025,64 +11082,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11813,30 +11866,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11933,7 +11990,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -12026,166 +12083,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12195,60 +12252,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12321,34 +12378,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12548,7 +12605,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12626,36 +12683,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12731,73 +12788,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12872,27 +12929,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14058,11 +14115,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14076,15 +14133,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15121,101 +15178,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15325,6 +15382,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "No valid plugin found in "
+
 #~ msgid "Communicate with the Kindle 2 eBook reader."
 #~ msgstr "Communicate with the Amazon Kindle 2 eBook reader."
 
diff --git a/src/calibre/translations/en_GB.po b/src/calibre/translations/en_GB.po
index 33ffffaa4a..d5a89e2b8e 100644
--- a/src/calibre/translations/en_GB.po
+++ b/src/calibre/translations/en_GB.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-02-15 08:46+0000\n"
 "Last-Translator: Vladimir Oka <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2011-03-27 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:53+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Does absolutely nothing"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Does absolutely nothing"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Does absolutely nothing"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Customise"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Cannot configure"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "File type"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadata reader"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadata writer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Catalogue generator"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "User Interface Action"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferences"
@@ -334,8 +334,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Add/remove your own columns to the calibre book list"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Customise the toolbar"
+msgid "Toolbar"
+msgstr "Toolbar"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -346,8 +346,8 @@ msgstr ""
 "available in each"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Customise searching"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -678,35 +678,31 @@ msgstr "This profile is intended for the B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "This profile is intended for the Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Installed plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapping for filetype plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Local plugin customisation"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Disabled plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Enabled plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "No valid plugin found in "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Initialisation of plugin %s failed with traceback:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -718,15 +714,15 @@ msgstr ""
 "    Customise calibre by loading external plugins.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Add a plugin by specifying the path to the zip file containing it."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Remove a custom plugin by name. Has no effect on builtin plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -734,15 +730,15 @@ msgstr ""
 "Customise plugin. Specify name of plugin and customisation string separated "
 "by a comma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "List all installed plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Enable the named plugin"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Disable the named plugin"
 
@@ -766,43 +762,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Communicate with S60 phones."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Use Series as Category in iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Cache covers from iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple device"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Communicate with iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Apple device detected, launching iTunes, please wait ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -810,27 +818,27 @@ msgstr ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Updating device metadata listing..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d of %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "finished"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -840,7 +848,7 @@ msgstr ""
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -848,31 +856,31 @@ msgstr ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "News"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catalogue"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Communicate with iTunes."
 
@@ -922,20 +930,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Getting list of books on device..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Transferring books to device..."
 
@@ -943,8 +951,8 @@ msgstr "Transferring books to device..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Adding books to device metadata listing..."
 
@@ -954,8 +962,8 @@ msgstr "Adding books to device metadata listing..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Removing books from device..."
 
@@ -963,17 +971,17 @@ msgstr "Removing books from device..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Removing books from device metadata listing..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Sending metadata to device..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK has not been installed."
 
@@ -1278,15 +1286,15 @@ msgstr "Communicate with the Sony PRS-500 eBook reader."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Communicate with all the Sony eBook readers."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "All by title"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "All by author"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1294,7 +1302,7 @@ msgstr ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1304,11 +1312,11 @@ msgstr ""
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Upload separate cover thumbnails for books (newer readers)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1322,13 +1330,13 @@ msgstr ""
 "WARNING: This option should only be used with newer SONY readers: 350, 650, "
 "950 and newer."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Refresh separate covers when using automatic management (newer readers)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1338,11 +1346,11 @@ msgstr ""
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Preserve cover aspect ratio when building thumbnails"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1352,6 +1360,17 @@ msgstr ""
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1488,7 +1507,7 @@ msgstr "Extra customisation"
 msgid "Communicate with an eBook reader."
 msgstr "Communicate with an eBook reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Get device information..."
 
@@ -2299,7 +2318,7 @@ msgstr "Converting input to HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Running transforms on ebook..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Creating"
 
@@ -2452,7 +2471,7 @@ msgstr "Start"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Do not insert a Table of Contents at the beginning of the book."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2470,6 +2489,10 @@ msgstr ""
 "\"Table of Contents\" settings (turn on \"Force use of auto-generated Table "
 "of Contents)."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2870,105 +2893,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "TEMPLATE ERROR"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "No"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Yes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Title"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Publisher"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Comments"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Tags"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Series"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Language"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Published"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Rights"
 
@@ -3407,7 +3430,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Metadata source"
 
@@ -3545,7 +3568,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML TOC generation options."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3741,6 +3764,7 @@ msgid "Author"
 msgstr "Author"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Subject"
 
@@ -4071,71 +4095,75 @@ msgstr ""
 "paired with a txt-output-formatting option that is not none because links "
 "are always removed with plain text output."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "Send file to storage card instead of main memory by default"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Confirm before deleting"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Main window geometry"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Notify when a new version is available"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Use Roman numerals for series number"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Sort tags list by name, popularity, or rating"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Number of covers to show in the cover browsing mode"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Defaults for conversion to LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Options for the LRF ebook viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formats that are viewed using the internal viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Columns to be displayed in the book list"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Automatically launch content server on application startup"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Oldest news kept in database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Show system tray icon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Upload downloaded news to device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Delete books from library after uploading to device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4143,24 +4171,24 @@ msgstr ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Disable notifications from the system tray icon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "Default action to perform when send to device button is clicked"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
-msgid ""
-"Start searching as you type. If this is disabled then search will only take "
-"place when the Enter or Return key is pressed."
-msgstr ""
-"Start searching as you type. If this is disabled then search will only take "
-"place when the Enter or Return key is pressed."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
+"Start searching as you type. If this is disabled then search will only take "
+"place when the Enter or Return key is pressed."
+msgstr ""
+"Start searching as you type. If this is disabled then search will only take "
+"place when the Enter or Return key is pressed."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
+msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
@@ -4169,44 +4197,44 @@ msgstr ""
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maximum number of waiting worker processes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Download social metadata (tags/rating/etc.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Overwrite author and title with new metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Automatically download the cover, if available"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Limit max simultaneous jobs to number of CPUs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "The layout of the user interface"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Show the average rating per item indication in the tag browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Disable UI animations"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "tag browser categories not to display"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Choose Files"
 
@@ -4422,8 +4450,8 @@ msgstr "User annotations generated from main library only"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "No books selected"
@@ -4626,7 +4654,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4696,7 +4724,7 @@ msgid "Bulk convert"
 msgstr "Bulk convert"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Cannot convert"
 
@@ -4704,7 +4732,7 @@ msgstr "Cannot convert"
 msgid "Starting conversion of %d book(s)"
 msgstr "Starting conversion of %d book(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "Empty output file, probably the conversion process crashed"
 
@@ -4894,7 +4922,7 @@ msgid "Stop Content Server"
 msgstr "Stop Content Server"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Email to"
 
@@ -4902,32 +4930,32 @@ msgstr "Email to"
 msgid "Email to and delete from library"
 msgstr "Email to and delete from library"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(delete from library)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Setup email based sharing of books"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Send to device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Connect/share"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -5014,20 +5042,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Downloading {0} for {1} book(s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Cannot edit metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Cannot merge books"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "At least two books must be selected for merging"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5035,7 +5063,7 @@ msgstr ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5047,7 +5075,7 @@ msgstr ""
 "second and subsequently selected books will not be deleted or "
 "changed.<br><br>Please confirm you want to proceed."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5067,7 +5095,7 @@ msgstr ""
 "and subsequently selected books will be permanently <b>deleted</b> from your "
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5085,19 +5113,19 @@ msgstr ""
 "books will be permanently <b>deleted</b> from your calibre library.<br><br>  "
 "Are you <b>sure</b> you want to proceed?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Fetch news"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Fetching news from "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " fetched."
 
@@ -5162,7 +5190,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Run welcome wizard"
 
@@ -5413,7 +5441,7 @@ msgid "The specified directory could not be processed."
 msgstr "The specified directory could not be processed."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "No books"
 
@@ -5632,8 +5660,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Path"
 
@@ -5643,17 +5671,17 @@ msgstr "Path"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formats"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Collections"
 
@@ -5663,25 +5691,25 @@ msgid "Click to open"
 msgstr "Click to open"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "None"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5739,7 +5767,7 @@ msgstr "output"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5762,14 +5790,14 @@ msgstr "output"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6358,10 +6386,14 @@ msgstr "Do not insert a &Table of Contents at the beginning of the book."
 msgid "FB2 Output"
 msgstr "FB2 Output"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Sectionise:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Font rescaling wizard"
@@ -6984,7 +7016,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7599,21 +7631,21 @@ msgstr "Error"
 msgid "Error communicating with device"
 msgstr "Error communicating with device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "No suitable formats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Select folder to open as device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Error talking to device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7621,67 +7653,67 @@ msgstr ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Device: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detected."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "selected to send"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i of %i Books"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 of %i Books"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Choose format to send to device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "No device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Cannot send: No device is connected"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "No card"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Cannot send: Device has no storage card"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Auto convert the following books before uploading to the device?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Sending catalogues to device."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Sending news to device."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Sending books to device."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7689,11 +7721,11 @@ msgstr ""
 "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."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "No space on device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7995,7 +8027,7 @@ msgstr "Choose Format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -8133,7 +8165,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Cancel"
 
@@ -8182,8 +8214,8 @@ msgid "Location"
 msgstr "Location"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8215,12 +8247,12 @@ msgid "Author sort"
 msgstr "Author sort"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Invalid author name"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Author names cannot contain & characters."
 
@@ -8411,22 +8443,22 @@ msgid "Working"
 msgstr "Working"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Lower Case"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Upper Case"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Title Case"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Capitalize"
 
@@ -10022,12 +10054,12 @@ msgid "%s (was %s)"
 msgstr "%s (was %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Item is blank"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "An item cannot be set to nothing. Delete it instead."
 
@@ -10098,7 +10130,7 @@ msgid "Send test mail from %s to:"
 msgstr "Send test mail from %s to:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -10352,62 +10384,62 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Email %s to %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "News:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Attached is the %s periodical downloaded by calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Attached, you will find the e-book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "by"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "in the %s format."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Sending email to"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "Auto convert the following books before sending via email?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Could not email the following books as no suitable formats were found:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Failed to email book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "sent"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Sent news to"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10431,67 +10463,85 @@ msgstr ""
 "group names for the various metadata entries are documented in "
 "tooltips.</p></div>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Regular &expression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "File &name:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Title:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regular expression (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "No match"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Authors:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Regular expression (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Series:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regular expression (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Series index:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regular expression (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regular expression (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Cover Browser"
@@ -10702,48 +10752,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Edit template"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "On Device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Size (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Book %s of %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "The lookup/search name is \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "This book's UUID is \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "In Library"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Size"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Book <font face=\"serif\">%s</font> of %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Marked for deletion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Double click to <b>edit</b> me<br><br>"
 
@@ -10820,7 +10870,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>No matches</b> for the search phrase <i>%s</i> were found."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "No matches found"
 
@@ -10837,12 +10887,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF Viewer toolbar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Next Page"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Previous Page"
 
@@ -11723,19 +11773,26 @@ msgstr "Make &default"
 msgid "&Remove email"
 msgstr "&Remove email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Auto send"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formats to email. The first matching format will be sent."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11743,7 +11800,7 @@ msgstr ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "new email address"
 
@@ -11755,91 +11812,91 @@ msgstr "Narrow"
 msgid "Wide"
 msgstr "Wide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Medium"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Small"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Large"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Always"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Never"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "By first letter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Disabled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Partitioned"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "User Interface &layout (needs restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "&Number of covers to show in browse mode (needs restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Choose &language (requires restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Show &average ratings in the tags browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr "Disable all animations. Useful if you have a slow/old computer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Disable &animations"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Enable system &tray icon (needs restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Show &splash screen at startup"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Disable &notifications in system tray"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Use &Roman numerals for series"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Show cover &browser in a separate window (needs restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11853,11 +11910,11 @@ msgstr ""
 "have a list of fixed-sized groups. Set to disabled\n"
 "if you never want subcategories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -11867,11 +11924,11 @@ msgstr ""
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11881,52 +11938,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Toolbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Icon size:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Show &text under icons:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Split the toolbar into two toolbars"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Interface font:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Change &font (needs restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Apply"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Restore &defaults"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Save changes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Cancel and return to overview"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Restoring to defaults not supported for"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11934,15 +11987,15 @@ msgstr ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
-msgid ""
-"The changes you have made require calibre be restarted immediately. You will "
-"not be allowed set any more preferences, until you restart."
-msgstr ""
-"The changes you have made require calibre be restarted immediately. You will "
-"not be allowed set any more preferences, until you restart."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+msgid ""
+"The changes you have made require calibre be restarted immediately. You will "
+"not be allowed set any more preferences, until you restart."
+msgstr ""
+"The changes you have made require calibre be restarted immediately. You will "
+"not be allowed set any more preferences, until you restart."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Restart needed"
@@ -12811,30 +12864,34 @@ msgid "The main toolbar"
 msgstr "The main toolbar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "The main toolbar when a device is connected"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "The context menu for the books in the calibre library"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "The context menu for the books on the device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Cannot add"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Cannot add the actions %s to this location"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Cannot remove"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Cannot remove the actions %s from this location"
 
@@ -12941,7 +12998,7 @@ msgstr "Apply any changes you made to this tweak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Search"
@@ -13035,168 +13092,168 @@ msgstr "Click to change"
 msgid "&Alternate shortcut:"
 msgstr "&Alternate shortcut:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Rename %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr "Edit sort for %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Search for %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "Search for everything but %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Hide category %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Show category"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Search for books in category %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "Search for books not in category %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Manage %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Manage Saved Searches"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Manage User Categories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Show all categories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Change sub-categorization scheme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Changing the authors for several books can take a while. Are you sure?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Searches"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Duplicate search name"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "The saved search name %s is already used."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Find item in tag browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13212,61 +13269,61 @@ msgstr ""
 "*foo will filter all categories at once, showing only those items\n"
 "containing the text \"foo\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "F&ind"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Find the first/next matching item"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Collapse all categories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr "No More Matches.</b><p> Click Find again to go to first match"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Sort by name"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Sort by popularity"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Sort by average rating"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Set the sort order for entries in the Tag Browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Match all"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Match any"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Manage &user categories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Add your own categories to the Tag Browser"
 
@@ -13346,23 +13403,23 @@ msgstr ""
 "log will be available in the file: %s<p>The log will be displayed "
 "automatically."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Conversion Error"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Recipe Disabled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Failed</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "There are active jobs. Are you sure you want to quit?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13372,11 +13429,11 @@ msgstr ""
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Active jobs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13585,7 +13642,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Options to customise the ebook viewer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Remember last used window size"
 
@@ -13668,36 +13725,36 @@ msgstr ""
 "You are in the middle of editing a keyboard shortcut first complete that, by "
 "clicking outside the  shortcut editing box."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Lookup in dictionary"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Go to..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Next Section"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Previous Section"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Document Start"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Document End"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Section Start"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Section End"
 
@@ -13773,75 +13830,75 @@ msgstr "Print Preview"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Choose ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "No matches found for: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Loading flow..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Laying out %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Bookmark #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Add bookmark"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Enter title for bookmark:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Manage Bookmarks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Loading ebook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Could not open ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Options to control the ebook viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-"If specified, viewer window will try to come to the front when started."
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+"If specified, viewer window will try to come to the front when started."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "If specified, viewer window will try to open full screen when started."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Print javascript alert and console messages to the console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13919,27 +13976,27 @@ msgstr "Find previous occurrence"
 msgid "Print eBook"
 msgstr "Print eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Change Case"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Swap Case"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Drag to resize"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Show"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Hide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Toggle"
 
@@ -15423,11 +15480,11 @@ msgstr ""
 "\n"
 "For help on an individual command: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "No label was provided"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15443,15 +15500,15 @@ msgstr "%sAverage rating is %3.1f"
 msgid "Main"
 msgstr "Main"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migrating old database to ebook library in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Copying <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Compacting database"
 
@@ -16622,95 +16679,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Unknown News Source"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "The \"%s\" recipe needs a username and password."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Download finished"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Failed to download the following articles:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "Failed to download parts of the following articles:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " from "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tFailed links:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "Could not fetch article."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr "The debug traceback is available earlier in this log"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr "Run with -vv to see the reason"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Fetching feeds..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Got feeds from index page"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Trying to download cover..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Generating masthead..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Starting download [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Feeds downloaded to %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Could not download cover: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Downloading cover from %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Masthead image downloaded"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Untitled Article"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Article downloaded: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Article download failed: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Fetching feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16718,7 +16775,7 @@ msgstr ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17666,9 +17723,6 @@ msgstr "Do not download CSS stylesheets."
 #~ msgid "Use &Roman numerals for series number"
 #~ msgstr "Use &Roman numerals for series number"
 
-#~ msgid "Toolbar"
-#~ msgstr "Toolbar"
-
 #~ msgid "Select visible &columns in library view"
 #~ msgstr "Select visible &columns in library view"
 
@@ -18288,6 +18342,9 @@ msgstr "Do not download CSS stylesheets."
 #~ msgid "Failed to download article: %s from %s\n"
 #~ msgstr "Failed to download article: %s from %s\n"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "No valid plugin found in "
+
 #~ msgid ""
 #~ "XPath expression to find the name of each page in the pagination map "
 #~ "relative to its boundary element. Default is to number all pages staring "
@@ -19715,6 +19772,9 @@ msgstr "Do not download CSS stylesheets."
 #~ msgid "Search as you type"
 #~ msgstr "Search as you type"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Split the toolbar into two toolbars"
+
 #~ msgid ""
 #~ "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 #~ "deprecated version of SYSFS."
@@ -19735,6 +19795,9 @@ msgstr "Do not download CSS stylesheets."
 #~ msgid "All available tweaks"
 #~ msgstr "All available tweaks"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Customise the toolbar"
+
 #~ msgid "Pick the recipe to customize"
 #~ msgstr "Pick the recipe to customise"
 
@@ -20353,6 +20416,9 @@ msgstr "Do not download CSS stylesheets."
 #~ "dialog,\n"
 #~ "then rebuild the catalogue.\n"
 
+#~ msgid "Customize searching"
+#~ msgstr "Customise searching"
+
 #~ msgid ""
 #~ "To use librarything.com you must sign up for a %sfree account%s and enter "
 #~ "your username and password separated by a : below."
diff --git a/src/calibre/translations/eo.po b/src/calibre/translations/eo.po
index a051fe02ad..bcbde4d93c 100644
--- a/src/calibre/translations/eo.po
+++ b/src/calibre/translations/eo.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-01-09 00:03+0000\n"
 "Last-Translator: Kalle Kniivilä <kalle@kniivila.net>\n"
 "Language-Team: Esperanto <eo@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: 2011-03-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:43+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Faras absolute nenion"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Faras absolute nenion"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Faras absolute nenion"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Faras absolute nenion"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Faras absolute nenion"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Faras absolute nenion"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Faras absolute nenion"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Faras absolute nenion"
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Bazo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Dosiertipo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Legado de metadatumoj"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Skribado de metadatumoj"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -333,7 +333,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -343,7 +343,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -668,35 +668,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Instalitaj kromprogramoj"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Agordoj de lokaj kromprogramoj"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Malŝaltitaj kromprogramoj"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Nevalida kromprogramo trovita en "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Aktivigo de kromprogramo malsukcesis %s kun la indiko:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -708,19 +704,19 @@ msgstr ""
 "   Agordi Calibre per aktivigo de eksteraj kromprogramoj.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Aldoni kromprogramon, indikante la padon al la zip-dosierujo en kiu ĝi "
 "troviĝas."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Forigi kromprogramon indikante ĝian nomon. Ne influas enkonstruitajn "
 "kromprogramojn."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -728,15 +724,15 @@ msgstr ""
 "Agordi kromprogramon. Indiku la nomon de la kromprogramo kaj la agordokodon, "
 "dividite per komo."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Listigi ĉiujn kromprogramojn"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Ŝalti la indikitan kromprogramon"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Malŝalti la indikitan kromprogramon"
 
@@ -760,106 +756,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -903,20 +911,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -924,8 +932,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -935,8 +943,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -944,17 +952,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1253,32 +1261,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1287,29 +1295,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1442,7 +1461,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2079,7 +2098,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2194,7 +2213,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2205,6 +2224,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2554,105 +2577,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3035,7 +3058,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3168,7 +3191,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3334,6 +3357,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3598,135 +3622,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3934,8 +3962,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4132,7 +4160,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4198,7 +4226,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4206,7 +4234,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4387,7 +4415,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4395,32 +4423,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4507,26 +4535,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4534,7 +4562,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4546,7 +4574,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4557,19 +4585,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4634,7 +4662,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4876,7 +4904,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5078,8 +5106,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5089,17 +5117,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5109,25 +5137,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5185,7 +5213,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5208,14 +5236,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5780,10 +5808,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6375,7 +6407,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6960,97 +6992,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7336,7 +7368,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7472,7 +7504,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7519,8 +7551,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7552,12 +7584,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7741,22 +7773,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9236,12 +9268,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9310,7 +9342,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9545,61 +9577,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9613,67 +9645,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9881,48 +9931,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9997,7 +10047,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10014,12 +10064,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10825,25 +10875,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10855,91 +10912,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10948,22 +11005,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10973,64 +11030,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11761,30 +11814,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11881,7 +11938,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11974,166 +12031,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12143,60 +12200,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12269,34 +12326,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12496,7 +12553,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12574,36 +12631,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12679,73 +12736,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12820,27 +12877,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14006,11 +14063,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14024,15 +14081,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15069,101 +15126,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15273,6 +15330,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nevalida kromprogramo trovita en "
+
 #~ msgid "Communicate with the Cybook Gen 3 eBook reader."
 #~ msgstr "Komuniki kun la aparato Cybook Gen 3."
 
diff --git a/src/calibre/translations/es.po b/src/calibre/translations/es.po
index 8ae62d0fd9..af76e2fa27 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: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-26 10:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-02 09:52+0000\n"
 "Last-Translator: Jellby <Unknown>\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: 2011-03-27 04:47+0000\n"
+"X-Launchpad-Export-Date: 2011-04-03 04:39+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:527
@@ -32,15 +32,15 @@ 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:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Complementos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "No hace absolutamente nada"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -51,7 +51,7 @@ msgstr "No hace absolutamente nada"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -68,9 +68,9 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -90,7 +90,7 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -136,19 +136,19 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -156,12 +156,12 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -172,11 +172,11 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -190,46 +190,46 @@ msgstr "No hace absolutamente nada"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personalizar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "No se puede configurar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tipo de fichero"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Lector de metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Escritor de metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generador de catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Acción de interfaz de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferencias"
@@ -357,8 +357,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Añada/elimine sus propias columnas en la lista de libros de calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Personalizar la barra de herramientas"
+msgid "Toolbar"
+msgstr "Barra de herramientas"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -369,8 +369,8 @@ msgstr ""
 "las acciones que estarán disponible en cada uno"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Personalizar las búsquedas"
+msgid "Searching"
+msgstr "Búsqueda"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -702,32 +702,28 @@ msgstr "Este perfil está orientado al B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Este perfil está pensado para el Sandra Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Asociaciones para complementos por tipos de fichero"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Personalización del complemento local"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Complementos desactivados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Complementos habilitados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-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:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -739,18 +735,18 @@ msgstr ""
 "    Personalizar calibre cargando complementos externos.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -758,15 +754,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:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Lista de todos los complementos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Activar el complemento nombrado"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Desactivar el complemento nombrado"
 
@@ -790,49 +786,70 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunicar con teléfonos S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+"<p>Si ni quiere que calibre reconozca su dispositivo Apple al conectarlo al "
+"ordenador, pulse en «<b>Desactivar el controlador de Apple</b>».</p>\r\n"
+"<p>Para transferir libros al dispositivo, pulse en «<b>Desactivar el "
+"controlador de Apple</b>» y luego use el método de «Conexión con iTunes» "
+"recomendado en la <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, usando el menú «<em>Conectar/compartir</em>|<em>Conectar a "
+"iTunes</em>».</p>\r\n"
+"<p>La activación del controlador de Apple para conectar directamente con los "
+"dispositivos de Apple es una opción avanzada y sin soporte.</p>\r\n"
+"<p></p>"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr "Desactivar el controlador de Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr "Activar el controlador de Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Usar la serie como categoría en iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 "Actívelo para usar el nombre de la serie como género de iTunes o categoría "
 "de iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Guardar las portadas de iTunes/iBooks en caché"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 "Actívelo para mostrar y guardar en caché las portadas de iTunes o iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr "Omitir la recomendación para «Conectar con iTunes»"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-"Actívelo para no mostrar el diálogo de recomendación para «Conectar con "
-"iTunes»"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Dispositivo Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Comunicarse con iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "Dispositivo Apple detectado. Iniciando iTunes. Un momento, por favor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -841,27 +858,27 @@ msgstr ""
 "la biblioteca de iTunes al escritorio, y entonces añadelos en la ventana "
 "Biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Actualizando listado de meta datos..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "terminado"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -871,7 +888,7 @@ msgstr ""
 "Bórrelos utilizando la aplicación iBooks.\n"
 "Pulse \"Mostrar Detalles\" para ver una lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -879,31 +896,31 @@ msgstr ""
 "Algunas portadas no se pudieron convertir.\n"
 "Pulse en \"Mostrar detalles\" para ver una lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Noticias"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Comunicarse con iTunes."
 
@@ -955,20 +972,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Obteniendo la lista de libros en el dispositivo ..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Transfiriendo libros al dispositivo..."
 
@@ -976,8 +993,8 @@ msgstr "Transfiriendo libros al dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Añadiendo libros al listado de metatados del dispositivo..."
 
@@ -987,8 +1004,8 @@ msgstr "Añadiendo libros al listado de metatados del dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Eliminando libros del dispositivo..."
 
@@ -996,17 +1013,17 @@ msgstr "Eliminando libros del dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Eliminando libros del listado de metatados del dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Enviando metadatos al dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "El SDK Bambook no está instalado."
 
@@ -1323,15 +1340,15 @@ msgstr "Comunicar con el lector Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunicarse con todos los lectores Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Todos por título"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Todos por autor"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1339,7 +1356,7 @@ msgstr ""
 "Lista (separada por comas) de campos de metadatos para convertir en "
 "colecciones en el dispositivo. Las posibilidades son: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1349,11 +1366,11 @@ msgstr ""
 "valores a la lista para activarlas. A las colecciones se les asignará el "
 "nombre dado después del carácter «:»."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Enviar miniaturas de portadas para los libros (lectores recientes)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1367,14 +1384,14 @@ msgstr ""
 "portada. ADVERTENCIA: Esta opción sólo puede ser usada con los nuevos "
 "lectores de SONY: 350, 650, 950 y más recientes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Actualizar las portadas por separado al usar la gestión automática (lectores "
 "recientes)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1384,11 +1401,11 @@ msgstr ""
 "que se conecte el dispositivo. Desactívela si la cantidad de libros en el "
 "lector es tal que afecta al rendimiento."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Mantener las proporciones de la portada al generar las miniaturas"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1399,6 +1416,21 @@ msgstr ""
 "quiere que las miniaturas tengan el tamaño máximo, independientemente de la "
 "proporción."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr "Buscar libros en todas las carpetas"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+"Si se activa esta opción, calibre buscará libros en todas las carpetas del "
+"dispositivo y sus tarjetas. Esto le permite a calibre encontrar libros que "
+"han sido almacenados en el dispositivo por otros programas o por descarga "
+"inalámbrica."
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1537,7 +1569,7 @@ msgstr "Personalización adicional"
 msgid "Communicate with an eBook reader."
 msgstr "Comunicar con un lector de libros electrónicos."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Obtener información del dispositivo..."
 
@@ -2391,7 +2423,7 @@ msgstr "Convirtiendo entrada a HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Aplicando transformaciones al libro electrónico..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Creando"
 
@@ -2549,7 +2581,7 @@ msgstr "Iniciar"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "No incluir un Índice al principio del libro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2567,6 +2599,10 @@ msgstr ""
 "de estructura» o «Índice» (active «Forzar el uso del Índice generado "
 "automáticamente»)."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr "para una lista completa con descripciones."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2971,105 +3007,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "ERROR DE PLANTILLA"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "No"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Sí"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Editorial"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Productor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Comentarios"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Idioma"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Marca de tiempo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Publicado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Derechos"
 
@@ -3519,7 +3555,7 @@ msgid "Amazon timed out. Try again later."
 msgstr ""
 "El tiempo de espera de Amazon ha expirado. Vuelva a intentarlo más tarde"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Fuente de metadatos"
 
@@ -3660,7 +3696,7 @@ msgid "HTML TOC generation options."
 msgstr "Opciones de generación del Índice HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3868,6 +3904,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Tema"
 
@@ -4229,74 +4266,78 @@ msgstr ""
 "no es «ninguno», porque las referencias a imágenes siempre se eliminan en la "
 "salida de texto simple."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Enviar fichero a tarjeta de almacenamiento en vez de a memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Confirmar antes de borrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Geometría de la ventana principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Notificar cuando haya una nueva versión disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Usar números romanos para los número de series"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Ordenar la lista de etiquetas por nombre, popularidad o calificación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr "Buscar un término o todos en las etiquetas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Numero de portadas de libros a mostrar en el modo de exploración por portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Opciones predeterminadas para la conversión a LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opciones para el visor de libros LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formatos que se visualizan usando el visor interno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Columnas mostradas en la lista de libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Lanzar el servidor de contenidos automáticamente al iniciar la aplicación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Antigüedad máxima de las noticias guardadas en la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Mostrar el icono en la bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Pasar las noticias descargadas al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Eliminar libros de la biblioteca después de pasarlos al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4304,17 +4345,17 @@ msgstr ""
 "Mostrar el explorador de portadas en una ventana separada en vez de en la "
 "ventana principal de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Desactivar las notificaciones del icono de la bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Acción predeterminada que se ejecutará cuando se pulse el botón de «Enviar "
 "al dispositivo»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4322,7 +4363,7 @@ msgstr ""
 "Ir buscando según se teclea. Si se desactiva esta opción, la búsqueda sólo "
 "tendrá lugar cuando se pulse la tecla Intro."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
@@ -4332,46 +4373,46 @@ msgstr ""
 "búsqueda, en lugar de mostrar sólo las coincidencias. Puede pulsar la tecla "
 "N o la tecla F3 para ir al siguiente resultado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Númera máximo de procesos en espera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Descargar metadatos sociales (etiquetas/valoración/etc...)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Reemplazar el autor y el título con nuevos metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Descargar automáticamente la portada, si está disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Limitar el número de tareas al número de CPU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "El diseño de la interfaz de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 "Mostrar la calificación promedio de cada elemento en el explorador de "
 "etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Desactivar animaciones de la interfaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "Categorías del explorador de etiquetas que no se mostrarán"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Escoger ficheros"
 
@@ -4594,8 +4635,8 @@ msgstr "Usar anotaciones generadas sólo desde la biblioteca principal"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "No hay libros seleccionados"
@@ -4802,7 +4843,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4877,7 +4918,7 @@ msgid "Bulk convert"
 msgstr "Convertir en bloque"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "No se puede convertir"
 
@@ -4885,7 +4926,7 @@ msgstr "No se puede convertir"
 msgid "Starting conversion of %d book(s)"
 msgstr "Iniciando la conversión de %d libro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "Fichero de salida vacío, probablemente el proceso de conversión ha fallado"
@@ -5077,7 +5118,7 @@ msgid "Stop Content Server"
 msgstr "Detener servidor de contenidos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Enviar por correo electrónico a"
 
@@ -5085,32 +5126,32 @@ msgstr "Enviar por correo electrónico a"
 msgid "Email to and delete from library"
 msgstr "Mandar por correo electrónico y borrar de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(borrar de la biblioteca)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Configurar la compartición de libros por correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Enviar al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Conectar/compartir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Deteniendo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -5200,27 +5241,27 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Descargando {0} para {1} libro(s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "No se pueden editar los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "No se pueden unir los libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5232,7 +5273,7 @@ msgstr ""
 "segundo libro seleccionado y los siguientes no se borrarán ni se "
 "modificarán.<br>Confirme que desea continuar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5253,7 +5294,7 @@ msgstr ""
 "se <b>borrará<b/> permanentemente de tu libreria de Calibre.<br><br/> ¿Estas "
 "<b>seguro<b/> de que quieres continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5271,19 +5312,19 @@ msgstr ""
 "se <b>borrará<b/> permanentemente de tu libreria de Calibre.<br><br/> ¿Estas "
 "<b>seguro<b/> de que quieres continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Descargar noticias (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Obteniendo noticias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " obtenidas."
 
@@ -5348,7 +5389,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Ejecutar el asistente de bienvenida"
 
@@ -5415,7 +5456,7 @@ msgid ""
 "calibre library elsewhere."
 msgstr ""
 "Está intentando guardar los ficheros en su biblioteca de calibre. Esto puede "
-"corromper la biblioteca. Guardar en el disco tiene como objetivo exportar "
+"corromper la biblioteca. «Guardar en el disco» tiene como objetivo exportar "
 "los archivos de su biblioteca de calibre a otro lugar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:136
@@ -5600,7 +5641,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:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Sin libros"
 
@@ -5820,8 +5861,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Ruta"
 
@@ -5831,17 +5872,17 @@ msgstr "Ruta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Colecciones"
 
@@ -5851,25 +5892,25 @@ msgid "Click to open"
 msgstr "Clic para abrir"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Ninguno"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Pegar portada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Copiar portada"
 
@@ -5927,7 +5968,7 @@ msgstr "salida"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5950,14 +5991,14 @@ msgstr "salida"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6552,10 +6593,14 @@ msgstr "No incluir un Í&ndice al principio del libro."
 msgid "FB2 Output"
 msgstr "Salida FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Dividir en secciones:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr "Género"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Asistente para el redimensionado de tipos de letra"
@@ -7187,7 +7232,7 @@ msgid "Regex:"
 msgstr "Expresión regular:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "&Prueba"
 
@@ -7805,21 +7850,21 @@ msgstr "Error"
 msgid "Error communicating with device"
 msgstr "Error en la comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "No hay formatos adecuados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Seleccionar carpeta para abrir como un dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Error de comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7827,69 +7872,69 @@ 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /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:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i de %i libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 de %i libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Elige el formato para enviar al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Sin dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 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:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Sin tarjeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Enviando catálogos al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Enviando noticias al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Enviando libros al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7898,11 +7943,11 @@ msgstr ""
 "encontraron formatos adecuados. Convierta el(los) libro(s) a un formato "
 "soportado por su dispositivo antes de volver a intentarlo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "No hay espacio en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -8270,7 +8315,7 @@ msgstr "Elegir formato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formato"
 
@@ -8415,7 +8460,7 @@ msgstr "&Aceptar"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Cancelar"
 
@@ -8464,8 +8509,8 @@ msgid "Location"
 msgstr "Ubicación"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8502,12 +8547,12 @@ msgid "Author sort"
 msgstr "Orden de autor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Nombre de autor no válido"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Los nombres de autor no pueden contener «&»."
 
@@ -8708,22 +8753,22 @@ msgid "Working"
 msgstr "Procesando..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Minúsculas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Mayúsculas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Formato de título (todas las iniciales en mayúscula)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Poner en mayúsculas"
 
@@ -10401,12 +10446,12 @@ msgid "%s (was %s)"
 msgstr "%s (era %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "El elemento está en blanco"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "No puede establecerse un elemento en blanco. Bórrelo en su lugar."
 
@@ -10477,7 +10522,7 @@ msgid "Send test mail from %s to:"
 msgstr "Enviar correo de prueba desde %s a:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "Prueba"
 
@@ -10733,65 +10778,65 @@ msgstr "La descarga ha fallado"
 msgid "Failed to download from %r with error: %s"
 msgstr "La descarga de %r dio un error: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Enviar por correo electrónico %s a %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Noticias:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Se adjunta el fichero de %s descargado por calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "Libro electrónico:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "El libro electrónico está adjunto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "en el formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Enviando correo electrónico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 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/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Falló al enviar por correo el libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "enviado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Enviar noticias a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10815,67 +10860,85 @@ msgstr ""
 "nombre de grupo para las distintas entradas de metadatos están documentados "
 "en las ayudas.</p></div>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Expresión regular"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Nombre de fichero:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Título:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Expresión regular (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "No hay coincidencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autores:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Expresión regular (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Serie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Expresión regular (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Posición en la serie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Expresión regular (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Expresión regular (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr "Editorial:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr "Expresión regular (?P<publisher>)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr "Publicado:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr "Expresión regular (?P<published>)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Explorador de portadas"
@@ -11087,48 +11150,48 @@ msgstr "S"
 msgid "Edit template"
 msgstr "Modificar plantilla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "En el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Tamaño (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Libro %s de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 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:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "El UUID de este libro es «{0}»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "En la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Tamaño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Marcado para borrarlo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doble clic para <b>editarme</b><br><br>"
 
@@ -11205,7 +11268,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>No</b> se encontraron coincidencias para la búsqueda «<i>%s</i>»."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "No se encontraron coincidencias"
 
@@ -11222,12 +11285,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Barra de herramientas del visor de LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Página siguiente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Página anterior"
 
@@ -12140,21 +12203,31 @@ msgstr "Asignar como pre&determinada"
 msgid "&Remove email"
 msgstr "E&liminar correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Autoenviar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 "Formatos para enviar por correo electrónico. El primero formato que "
 "concuerde se enviará."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+"Asunto del mensaje que se usará al enviar. Si se deja en blanco, el asunto "
+"será el título. Además, las mismas plantillas que se usan para «Guardar en "
+"el disco», como {title} y {author_sort}, pueden usarse aquí."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -12163,7 +12236,7 @@ msgstr ""
 "<br>a esta dirección de correo electrónico (siempre que estén en uno de los "
 "formatos listados)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "nueva dirección de correo electrónico"
 
@@ -12175,93 +12248,93 @@ msgstr "Estrecho"
 msgid "Wide"
 msgstr "Ancho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Medio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Pequeño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Siempre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automático"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nunca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Por la primera letra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Particionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Diseño de la interfa&z de usuario (requiere reinicio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Se&leccionar idioma (requiere reiniciar el programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Mostrar &calificaciones promedio en el explorador de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 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/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Desactivar &animaciones"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Activar &icono en bandeja del sistema (requiere reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Mostrar pantalla de bien&venida al inicio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Desactivar &notificaciones en la bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Usar números &romanos para las series"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 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/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr "Metodo de &división de categorías en el navegador de etiquetas:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -12275,11 +12348,11 @@ msgstr ""
 "dividido para que se muestre una lista de grupos de tamaño\n"
 "fijo. Desactívelo si no quiere que se muestren nunca las subcategorías."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr "&Contraer cuando el número de elementos sea mayor de:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -12290,11 +12363,11 @@ msgstr ""
 "se divide en subcategorías. Si el método de división es desactivado, este "
 "valor no tiene función."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr "Categorías con elementos &jerárquicos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -12311,53 +12384,49 @@ msgstr ""
 "subcategorías de «Intriga». Si el cuadro no contiene «tags», entonces las\n"
 "etiquetas se mostrarán cada una por su cuenta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "Barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Tamaño de icono:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Mostrar &texto bajo los iconos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Dividir la barra de herramientas en dos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Tipo de letra de la interfaz:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Cambiar &tipo de letra (requiere reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Aplicar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Restaurar opciones &predeterminadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Cancelar y volver a la panorámica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 "La restauración de las opciones predeterminadas no está soportada para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -12365,7 +12434,7 @@ msgstr ""
 "Algunos cambios requieren un reinicio. Por favor, reinicie calibre cuanto "
 "antes."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -12374,7 +12443,7 @@ msgstr ""
 "podrá hacer ningún otro cambio en las preferencias hasta después del "
 "reinicio."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Se requiere reiniciar"
@@ -12694,7 +12763,7 @@ msgid ""
 "Save to Disk button:"
 msgstr ""
 "Aquí puede controlar cómo guardará calibre los libros cuando se pulse el "
-"botón Guardar a disco:"
+"botón «Guardar en el disco»:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:69
 msgid "Save &cover separately"
@@ -13283,31 +13352,35 @@ msgid "The main toolbar"
 msgstr "La barra principal de herramientas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr "La segunda barra de herramientas opcional"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr ""
 "La barra principal de herramientas cuando un dispositivo esta conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "El menu contextual para los libros en la biblioteca de Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "El menu contextual para los libros que están en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "No se puede añadir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "No se pueden añadir las acciones %s a esta ubicación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "No se puede eliminar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "No se pueden eliminar las acciones %s de esta ubicación"
 
@@ -13416,7 +13489,7 @@ msgstr "Aplicar los cambios realizados en este ajuste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Buscar"
@@ -13511,168 +13584,168 @@ msgstr "Pulse para cambiar"
 msgid "&Alternate shortcut:"
 msgstr "&Atajo alternativo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Renombrar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr "Modificar orden para %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr "Añadir %s a la categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr "Subcategorías de %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr "Borrar la búsqueda %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr "Eliminar %s de la categoría %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Buscar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "Buscar todo menos %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr "Añadir una subcategoría a %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr "Eliminar la categoría de usuario %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Ocultar categoría %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Mostrar categoría"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Buscar libros en la categoría %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "Buscar libros fuera de la categoría %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Administrar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Administrar búsquedas guardadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Administrar categorías de usuarios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Ver todas las categorias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Cambiar el método de división de categorías"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr "El nombre del término agrupado de búsqueda es «{0}»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Cambiar los autores de varios libros puede tardar un rato. ¿Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Cambiar los metadatos de muchos libros puede tardar un rato. ¿Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Búsquedas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr "Cambiar el nombre a la categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr "No puede usar puntos en el nombre de las categorías de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr "El nombre %s ya está en uso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Nombre de búsqueda duplicado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "El nombre guardado buscado %s está en uso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr "Nueva categoría"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr "Eliminar la categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr "%s no es una categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr "%s contiene elementos. ¿Esta seguro de que quiere borrarla?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr "Eliminar categoría"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr "La categoría de usuario %s no existe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr "Añadir a la categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr "No existe ninguna categoría de usuario llamada %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Buscar elemento en el navegador de entiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13688,64 +13761,64 @@ msgstr ""
 "Si introduce «*bla» se filtrarán todas las categorías a la vez, mostrando\n"
 "sólo los elementos que contienen el texto «bla»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "Buscar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Buscar el primer/siguiente item"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Contrae todas las categorías"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "No hay más coincidencias. </b><p> Click en Buscar para volver a la primera "
 "coincidencia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Ordenar por nombre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Ordenar por popularidad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Ordenar por calificación promedio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 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:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Buscar todas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Buscar cualquiera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Al seleccionar varias entradas en el navegador de etiquetas buscar una "
 "cualquiera o todas ellas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Administrar categorías de &usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Añada sus propias categorías al navegador de etiquetas"
 
@@ -13825,23 +13898,23 @@ msgstr ""
 "registro de depuración estará disponible en el fichero: %s<p>El registro se "
 "mostrará automáticamente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Receta deshabilitada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Fallo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13852,11 +13925,11 @@ msgstr ""
 "de datos en el dispositivo.<br>\n"
 "                      ¿Está seguro de que desea salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Tareas activas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -14067,7 +14140,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opciones para personalizar el visor de libros electrónicos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "&Recordar el último tamaño de ventana usado"
 
@@ -14153,36 +14226,36 @@ msgstr ""
 "Aún está modificando un atajo de teclado. Termine primero de hacerlo, "
 "pulsando fuera del cuadro de edición de atajos."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Localizar en el diccionario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Ir a..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Siguiente sección"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Sección anterior"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Inicio del documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Final del documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Inicio de la sección"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Final de la sección"
 
@@ -14260,76 +14333,76 @@ msgstr "Previsualización de impresión"
 msgid "Clear list of recently opened books"
 msgstr "Limpiar la lista de los libros abiertos recientemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Conectando con dict.org para buscar: <b>%s</b>..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Elegir libro electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Libros electrónicos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "No se encontraron correspondencias para: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Cargando flujo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Disponiendo %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Marcador #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Añadir marcador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Introducir el título del marcador:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Administrar marcadores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Cargando libro electrónico..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "No se pudo abrir el libro electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opciones para controlar el visor de libros electrónicos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Si se especifica, la ventana del visor intentará situarse en el frente "
 "cuando se inicie el programa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Si se activa, la ventana del visor tratará de iniciarse a pantalla completa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Dirigir alertas de javascript y mensajes de consola a la consola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -14407,27 +14480,27 @@ msgstr "Encontrar incidencia anterior"
 msgid "Print eBook"
 msgstr "Imprimir libro electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Cambiar mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Invertir mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Arrastre para ajustar el tamaño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Ocultar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Alternar"
 
@@ -15957,11 +16030,11 @@ msgstr ""
 "\n"
 "Para ver la ayuda de cada orden ejecute: %%prog orden --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "No se ha proporcionado ninguna etiqueta"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15977,17 +16050,17 @@ msgstr "%sCalificación promedio es %3.1f"
 msgid "Main"
 msgstr "Principal"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Migrando la base de datos antigua a la biblioteca de libros electrónicos "
 "en %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Compactando la base de datos"
 
@@ -17224,95 +17297,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Fuente de noticias desconocida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Descarga finalizada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tEnlaces fallidos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "No se ha podido obtener el artículo."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr "El rastreo de depuración aparece más arriba en este registro"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr "Ejecute con el parámetro -vv para ver el motivo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Obteniendo canales de noticias..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 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:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Intentando descargar la portada..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Generando el rótulo:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Iniciando la descarga [%d proceso(s)]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Canales de noticias descargados en %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "No se pudo descargar la portada: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Descargando la portada desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Imagen del rótulo descargada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Artículo sin título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artículo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Falló la descarga del artículo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Obteniendo canal de noticias"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -17320,7 +17393,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -18070,9 +18143,6 @@ msgstr "No descargar estilos CSS."
 #~ msgid "Very verbose output, useful for debugging."
 #~ msgstr "Salida extremadamente detallada, útil para depuración."
 
-#~ msgid "Toolbar"
-#~ msgstr "Barra de herramientas"
-
 #~ msgid "Show &text in toolbar buttons"
 #~ msgstr "Mostrar &texto en los botones de la barra de herramientas"
 
@@ -18248,6 +18318,9 @@ msgstr "No descargar estilos CSS."
 #~ "Información y mensajes más descriptivos. Útil para depuración de errores. Se "
 #~ "puede especificar varias veces para mayor descriptividad."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "No se ha encontrado ningún complemento válido en "
+
 #~ msgid "Invalid size"
 #~ msgstr "Tamaño no válido"
 
@@ -21470,6 +21543,9 @@ msgstr "No descargar estilos CSS."
 #~ msgid "Tags to apply when adding a book:"
 #~ msgstr "Etiquetas que se aplicarán cuando se añada un libro:"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Personalizar la barra de herramientas"
+
 #~ msgid "Read metadata from &file contents rather than file name"
 #~ msgstr ""
 #~ "Leer los metadatos del contenido del &fichero, en lugar del nombre de fichero"
@@ -21584,6 +21660,9 @@ msgstr "No descargar estilos CSS."
 #~ "terminado de retocar, cierre la ventana de explorador de ficheros y "
 #~ "reconstruya el ePub, lo que actualizará su biblioteca de calibre."
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Dividir la barra de herramientas en dos"
+
 #~ msgid "Library backup status..."
 #~ msgstr "Estado de copia de seguridad de la librería..."
 
@@ -22314,6 +22393,9 @@ msgstr "No descargar estilos CSS."
 #~ "categoría.</p>\n"
 #~ "        "
 
+#~ msgid "Customize searching"
+#~ msgstr "Personalizar las búsquedas"
+
 #~ msgid "Downloads series information from ww2.kdl.org"
 #~ msgstr "Descargar información de la serie de ww2.kdl.org"
 
@@ -22337,3 +22419,11 @@ msgstr "No descargar estilos CSS."
 #~ "{#genre:sublist(-1,0,.)} devuelve «C»<br/>\r\n"
 #~ "{#genre:sublist(0,1,.)} devuelve «A»<br/>\r\n"
 #~ "{#genre:sublist(0,-1,.)} devuelve «A.B»"
+
+#~ msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
+#~ msgstr ""
+#~ "Actívelo para no mostrar el diálogo de recomendación para «Conectar con "
+#~ "iTunes»"
+
+#~ msgid "Skip 'Connect to iTunes' recommendation"
+#~ msgstr "Omitir la recomendación para «Conectar con iTunes»"
diff --git a/src/calibre/translations/eu.po b/src/calibre/translations/eu.po
index 63e316b946..17a24a30af 100644
--- a/src/calibre/translations/eu.po
+++ b/src/calibre/translations/eu.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-02 12:04+0000\n"
 "Last-Translator: gorkaazk <gorkaazkarate@euskalerria.org>\n"
 "Language-Team: Basque <eu@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: 2011-03-27 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:41+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Ez du ezer egiten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Ez du ezer egiten"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Ez du ezer egiten"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Ez du ezer egiten"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Ez du ezer egiten"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Ez du ezer egiten"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Ez du ezer egiten"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Ez du ezer egiten"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Oinarria"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Pertsonalizatu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Cannot configure"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Fitxategi-mota"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadatuen irakurlea"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadatuen idazlea"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalogo-sortzailea"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Erabiltzailearen interfaze ekintza"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Hobespenak"
@@ -335,8 +335,8 @@ msgstr ""
 "zerrendara/zerrendatik"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Pertsonalizatu tresna-barra"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -347,8 +347,8 @@ msgstr ""
 "eskuragarri agertuko diren ekintzekin aldatuz."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Pertsonalizatu bilaketa"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -694,36 +694,32 @@ msgstr "Profil hau B&N Nook Color horrentzat sortu da."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Sanda Bambook horrentzat egindako profila."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Instalaturiko gehigarriak"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapaketa fitxategi-mota gehigarrientzat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Lokal gehigarrien pertsonalizazioa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Desgaitutako gehigarriak"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Gehigarri gaituak"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Baliogabeko gehigarria aurkitu da hemen: "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 "%s gehigarriaren abiarazteak huts egin du eta ondoko aztarna utzi du:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -735,18 +731,18 @@ msgstr ""
 "    Pertsonalizatu calibre kanpoko gehigarriak kargatuz.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Gehigarria gehitu bere barnean duen ZIP fitxategiaren bidea adieraziz."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Pertsonalizatutako gehigarria izenez kendu. Ez du efekturik izango "
 "\"builtin\" gehigarrietan, \"Nola eraiki zen\" gehigarrietan."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -754,15 +750,15 @@ msgstr ""
 "Pertsonalizatu gehigarria. Adierazi gehigarriaren izena eta "
 "pertsonalizaturiko katearena komaren bidez bereizirik."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Zerrendatu instalatutako gehigarri guztiak"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Gaitu izendaturiko gehigarria."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Desgaitu izendaturiko gehigarria."
 
@@ -786,47 +782,59 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "S60 telefonoekin komunikatu."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 "iTunes/iBooks horietan serieak erabiltzen ditu kategoriak izango balira "
 "bezala."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "iTunes/iBooks horietatik cache-azalak"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple markako gailua"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "iTunes/iBooks horiekin komunikatu."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "Apple enpresako gailua detektatu egin da, iTunes-en nabigatzen ari da, "
 "mesedez itxaron..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -834,27 +842,27 @@ msgstr ""
 "Ezin dira liburuak zuzenean gailu elektronikotik kopiatu. Herrestan eraman "
 "iTunes Liburutegitik mahaigainera, gero itsatsi calibre liburutegiko leihoan."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Irakurgailuaren zerrendatze metadatuak eguneratzen..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d-tik  %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "amaiturik"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -864,7 +872,7 @@ msgstr ""
 "Ezabatu \"iBooks app\" erabiliz.\n"
 "Egin ezazu klik 'Zehaztasunak erakutsi' zerrenda ikusteko."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -872,31 +880,31 @@ msgstr ""
 "Azalaren arte lan batzuk ezin izan dira bihurtu.\n"
 "Egin ezazu klik 'Zehaztasunak erakutsi' zerrenda ikusteko."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Albisteak"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalogoa"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Komunikatu iTunes horrekin ."
 
@@ -947,20 +955,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Liburu zerrenda gailutik eskuratzen..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Liburuak gailura transferitzen..."
 
@@ -968,8 +976,8 @@ msgstr "Liburuak gailura transferitzen..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Gailuaren metadatu zerrendara liburuak gehitzen..."
 
@@ -979,8 +987,8 @@ msgstr "Gailuaren metadatu zerrendara liburuak gehitzen..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Gailutik liburuak ezabatzen..."
 
@@ -988,17 +996,17 @@ msgstr "Gailutik liburuak ezabatzen..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Gailuaren metadatu zerrendatik liburuak kentzen..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Metadatuak gailura bidaltzen..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK ez da instalatu."
 
@@ -1319,15 +1327,15 @@ msgstr ""
 "Komunikatu \"Sony eBook readers\" horrekin laguntzen duten enpresako "
 "adituekin."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Guztiak izenburuaren arabera"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Guztiak egilearen arabera"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1335,7 +1343,7 @@ msgstr ""
 "Komez bereiziriko meta-datuen eremuen zerrenda gailuan bildumak bihurtzeko "
 "modukoak. Aukeren artean hauek: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1345,12 +1353,12 @@ msgstr ""
 "zerrendara balioei bidea emateko . Bilduma hauei  \":\" karakterearen osteko "
 "izena emango zaie."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 "Kargatu liburu-azalen argazki txikiak (irakurgailu berrienekin egin daiteke)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1365,33 +1373,44 @@ msgstr ""
 "reader gailu berri-berriekin bakarrik erabil daiteke, hau da: SONY 350, 650, "
 "950 eta geroagokoekin."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Eguneratu liburu-azalak bereizirik kudeaketa automatikoa erabiltzerakoan "
 "(irakurle berriak)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 "Aldaketarik ez ezarri liburu-azalen tamainen proportzioetan koadro txikiak "
 "sortzerakoan"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1536,7 +1555,7 @@ msgstr "Gainerako pertsonalizazioa."
 msgid "Communicate with an eBook reader."
 msgstr "Komunikatu eBook irakurgailu batekin."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Eskuratu gailuaren informazioa."
 
@@ -2397,7 +2416,7 @@ msgid "Running transforms on ebook..."
 msgstr ""
 "Liburu elektronikoan une honetan ari dira bihurtze aldaketak gertatzen..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Sortzen"
 
@@ -2564,7 +2583,7 @@ msgstr "Hasi"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Ez txertatu aurkibidea liburuaren hasieran."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2583,6 +2602,10 @@ msgstr ""
 "detekzioa\" edota \"Aurkibidea\" ezarpenak (piztu \"Behartu automatikoki "
 "sortutako aurkibidea\")."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -3013,105 +3036,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "AKATSA TXANTILOIAN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Ez"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Bai"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Izenburua"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Egilea(k)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Argitaratzailea"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Ekoizlea"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Iruzkinak"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiketak"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Serieak"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Dataren zigilua (noizkoa)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Argitaratua"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Eskubideak"
 
@@ -3559,7 +3582,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3703,7 +3726,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML aurkibideak sortzeko aukerak."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3903,6 +3926,7 @@ msgid "Author"
 msgstr "Egilea"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Gaia"
 
@@ -4227,75 +4251,79 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Lehenetsita: bidali fitxategia memoria-txartelara trepetaren memoria "
 "nagusira bidali beharrean"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Baieztatu ezabatu baino lehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Leiho nagusiaren geometria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Oharra bidali bertsio berri bat eskuragarri dagoen bakoitzean"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Erabili zenbaki erromatarrak zenbaki segidetarako"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 "Sailkatu etiketa zerrendak, izenen arabera, ospearen arabera edo balorazioen "
 "arabera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Erakutsiko den liburu-azal kopurua, liburu-azal-arakatzaile moduan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Lehenetsitako balioak LRF formatura bihurtzeko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Aukerak LRF liburu-e irakurgailuarentzat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Barneko irakurtzeko sistema erabilita ikus daitezkeen formatuak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Liburu zerrenda zenbat zutabetan erakutsiko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Automatikoki abiaraziko du zerbitzariko edukia hasi aplikazioan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Albiste zaharragoak datu basean gordeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Erakutsi sistemako erretiluaren ikonoa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Karga itzazu irakurgailuan deskargaturiko albisteak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Ezabatu liburuak liburutegitik irakurgailura kargatu eta gero"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4303,72 +4331,72 @@ msgstr ""
 "Erakutsi Cover Flow, (liburu-azal nabigazioa), berariazko leiho batean eta "
 "ez calibreren leiho nagusian"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Desgaitu abisuak sistemaren erretilu ikonotik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Lehenetsitako egiteko ekintza klik egiten duzunean \"bidali irakurgailura\" "
 "botoian"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "\"Langilearen zain\" prozesuen gehienezko kopurua"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 "Deskargatu gizarte mailako metadatuak (etiketak/balorazioak/eta abar.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 "Gainetik idatzi egilearen izena eta testuaren izenburua metadatu berriekin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Modu automatikoan deskargatu liburu-azala, eskura baldin badago."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 "Murriztu itzazu aldi bereko gehienezko egitekoen kopurua dauden CPU-en "
 "arabera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Erabiltzailearen interfazearen itxura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 "Erakutsi batez besteko balorazioa kontu bakoitzeko etiketen arakatzailean"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Desgaitu EI (erabiltzailearen interfazearen) animazioak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "etiketatu arakatzailearen kategoriak ez erakusteko moduan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Aukeratu fitxategiak"
 
@@ -4584,8 +4612,8 @@ msgstr "Liburutegi nagusian erabiltzaileak sortu dituen oharrak bakarrik"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Libururik ez da hautatu"
@@ -4787,7 +4815,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4858,7 +4886,7 @@ msgid "Bulk convert"
 msgstr "Bulk convert"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Ezin da bihurtu"
 
@@ -4866,7 +4894,7 @@ msgstr "Ezin da bihurtu"
 msgid "Starting conversion of %d book(s)"
 msgstr "%d liburu(ar)en bihurketa abiatzen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "Helburu fitxategia hutsik. Ziur aski bihurketa prozesuak huts egin du"
@@ -5058,7 +5086,7 @@ msgid "Stop Content Server"
 msgstr "Stop Content Server"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Email to"
 
@@ -5066,32 +5094,32 @@ msgstr "Email to"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Prestatu e-postaan oinarritutako liburuen partekatzea"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Bidali irakurgailura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Konektatu/Konpartitu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -5179,20 +5207,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Ezin izan dira metadatuak editatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Ezin izan dira liburuak bateratu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "Gutxienez bi liburu hautatu beharko dira haiekin bakarra egiteko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5200,7 +5228,7 @@ msgstr ""
 "Bost liburu baino gehiagorekin liburu bakarra egiteko prest zaude.  Benetan "
 "<b>ziur</b> zaude? Aurrera egingo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5213,7 +5241,7 @@ msgstr ""
 "liburuak ez dira ezabatuko ezta aldatuko ere.<br><br>Mesedez, baieztatu "
 "aurrera egin nahi duzula."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5234,7 +5262,7 @@ msgstr ""
 "dira zure calibre liburutegitik.<br><br> <b>Ziur</b> zaude? Benetan aurrera "
 "egin nahi duzu?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5252,19 +5280,19 @@ msgstr ""
 "bikoiztutako formatu guztiak <b>ezabatu egingo</b> dira betiko zure calibre "
 "liburutegitik.<br><br>  <b>Ziur zaude?</b> Benetan aurrera egin nahi duzu?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "Es"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Eskuratu berriak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Albisteak eskuratzen hemendik: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " eskuratuta."
 
@@ -5329,7 +5357,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Run welcome wizard"
 
@@ -5583,7 +5611,7 @@ msgid "The specified directory could not be processed."
 msgstr "Zehaztutako direktorioa ezin izan da prozesatu."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Libururik ez"
 
@@ -5807,8 +5835,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Bidea (Path)"
 
@@ -5818,17 +5846,17 @@ msgstr "Bidea (Path)"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formatuak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Bildumak"
 
@@ -5838,25 +5866,25 @@ msgid "Click to open"
 msgstr "Egin klik zabaltzeko"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Bat ere ez"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5914,7 +5942,7 @@ msgstr "outputa, helburua"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5937,14 +5965,14 @@ msgstr "outputa, helburua"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6534,10 +6562,14 @@ msgstr "Ez ezazu txertatu &Aurkibidea liburuaren hasieran."
 msgid "FB2 Output"
 msgstr "FB2 outputa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Moldatu ataletan:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Letra-tipoak berreskalatzeko laguntzaile-magialaria"
@@ -7158,7 +7190,7 @@ msgid "Regex:"
 msgstr "Regex (ohiko adierazpen):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Proba egin"
 
@@ -7766,21 +7798,21 @@ msgstr "Errorea"
 msgid "Error communicating with device"
 msgstr "Irakurgailuarekin komunikatzeko saioak huts egin du"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Ez dago formatu egokirik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Aukeratu karpeta bat irakurgailua izango balitz bezala zabaltzeko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Akatsen bat irakurgailuarekin komunikatzerakoan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7788,68 +7820,68 @@ msgstr ""
 "Behin-behineko huts egite bat egon da irakurgailuarekin komunikatzerakoan. "
 "Mesedez, deskonektatu eta konektatu berriro gailua, edo berrabiarazi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Gailua: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detektaturik."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "hautatua bidaltzeko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Aukeratu irakurgailura bidaltzeko formatua"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Gailurik ez dago"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Ezin izan da igorri: ez dago inolako gailurik konektatua"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Txartelik ez dago"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Ezin bidali: gailuak ez dauka memoria-txartelik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Bihurtu modu automatikoan hurrengo liburuak irakurgailuan kargatu aurretik?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Katalogoak irakurgailura bidaltzen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Albisteak irakurgailura bidaltzen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Liburuak irakurgailura bidaltzen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7858,11 +7890,11 @@ msgstr ""
 "topatu egin ez delako. Lehenengo eta behin, bihurtu liburua(k) zure "
 "irakurgailuak onartzen duen formaturen batean."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Lekurik ez irakurgailuan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -8166,7 +8198,7 @@ msgstr "Aukeratu formatua"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formatua"
 
@@ -8309,7 +8341,7 @@ msgstr "&Ados"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Bertan behera utzi"
 
@@ -8358,8 +8390,8 @@ msgid "Location"
 msgstr "Kokalekua"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8391,12 +8423,12 @@ msgid "Author sort"
 msgstr "Egile izenaren araberako sailkapena"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Baliogarria ez den egile izena"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Egile izenek ezin dute & karakterea eduki."
 
@@ -8595,22 +8627,22 @@ msgid "Working"
 msgstr "Lanean"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Letra xeheak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Letra larriak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Izenburuaren letra mota (xehe/larri)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Kapitalizatu"
 
@@ -10215,12 +10247,12 @@ msgid "%s (was %s)"
 msgstr "%s (%s izan da)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Elementua zuriz dago"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "Elementu bat ezin zaio ezerezari gehitu. Horren ordez, ezaba ezazu."
 
@@ -10294,7 +10326,7 @@ msgid "Send test mail from %s to:"
 msgstr "Igorri aztertzeko e-posta bat hemendik %s horra:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Aztertu"
 
@@ -10550,65 +10582,65 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "E-postal %s honi %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Albisteak:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Erantsita %s dago, calibrek periodikoki deskargatua."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "Liburu elektronikoa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Erantsita, liburu elektronikoa topatuko duzu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "egilea:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "%s formatuan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "E-posta igortzen honi:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Bihurtu modu automatikoan ondorengo liburuak e-postaren bidez igorri "
 "aurretik?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Ezin izan da e-postaz ondorengo liburuak igorri formatu egokirik topatu ez "
 "delako:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Ezin izan da liburua postaz bidali"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "bidalia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Bidali albisteak honi:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10622,67 +10654,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Adierazpen &arrunta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Fitxategi- &izena:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Izenburua:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Adierazpen arrunta (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Bat etortzerik ez"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Egileak:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Adierazpen arrunta (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Seriea:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Adierazpen arrunta (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Seriearen aurkibidea:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Adierazpen arrunta (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBNa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Adierazpen arrunta (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Liburu-azalen arakatzailea"
@@ -10894,48 +10944,48 @@ msgstr "B"
 msgid "Edit template"
 msgstr "Editatu txantiloia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Irakurgailuan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Tamaina (Mb)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "%s liburua %s-etatik."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Bilaketa izena hauxe: \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "Liburu honen UUID (Universally Unique Identifier) hauxe da: \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "Liburutegian"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Tamaina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Liburua <font face=\"serif\">%s</font> honi buruz: %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Ezabatzeko markatuta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Egin ezazu klik birritan <b>editatzeko</b><br><br>"
 
@@ -11012,7 +11062,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "Ez da <b>bat datorrenik</b> esaldia bilatzerakoan <i>%s</i> aurkitu."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Ez da bat datorrenik aurkitu"
 
@@ -11029,12 +11079,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF Ikustailearen tresna-barra"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Hurrengo orrialdea"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Aurreko orrialdea"
 
@@ -11909,21 +11959,28 @@ msgstr "Ezarri &lehenetsita"
 msgid "&Remove email"
 msgstr "&Ezabatu e-posta helbidea"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Modu automatikoan bidalia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "E-posta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 "E-posta formatuak. Egokitzen den, bat egiten duen lehen formatua igorri "
 "egingo da."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11932,7 +11989,7 @@ msgstr ""
 "dira<br>posta helbide honetara (zerrendatutako formaturen batean eman izan "
 "da helbide hori)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "e-posta helbide berria"
 
@@ -11944,96 +12001,96 @@ msgstr "Estu"
 msgid "Wide"
 msgstr "Zabal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Ertain"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Txiki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Handi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Beti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Inoiz ez"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Lehen letratik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Desgaitua"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Partizioduna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Erabiltzailearen interfazearen &diseinua (berrabiarazi beharko):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "Nabigatzaile moduan erakusteko liburu-azalen &Kopurua  (berrabiarazi "
 "beharko):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Aukeratu &hizkuntza (berrabiarazi beharko gero):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Erakutsi &batez besteko balorazioak etiketen arakatzailean"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Desgaitu animazio guztiak. Erabilgarria ordenagailu motela/zaharra baldin "
 "badaukazu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Desgaitu &animazioak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Gaitu sistema &erretilu ikonoa (berrabiarazi beharko)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Erakutsi &splash (harrerako) pantaila hasterakoan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Desgaitu &abisuak sistemaren erretiluan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Erabili &Erromatar zenbakiak serietan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Erakutsi liburu-azala &arakatzailea leiho bananduetan (berrabiarazi beharko)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -12047,11 +12104,11 @@ msgstr ""
 "izateko neurriz egokiturik dauden taldeak. Ezarri desgaitua\n"
 "ez badituzu inoiz azpikategoriak nahi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -12062,11 +12119,11 @@ msgstr ""
 "azpi-kategorietan. Zatiketa metodoa desgaituta baldin badago, balio honi ez "
 "zaio jaramonik egingo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -12076,52 +12133,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Tresna-barra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Ikonoaren tamaina:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Erakutsi &testua ikonoen azpian:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Banatu tresna barra bi tresna barra berrietan"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Interfazeko letra-tipoa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Aldatu &letra-tipoa (berrabiazi beharko)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Aplikatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Berrezarri &lehenetsiak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Gorde aldaketak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Bertan behera utzi eta itzuli ikuspegi orokorrera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Lehenetsitako balioak berreskuratzea ez dago onartua honentzat :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -12129,7 +12182,7 @@ msgstr ""
 "Egindako aldaketa batzuek berrabiaraztea eskatzen dute. Mesedez, "
 "berrabiarazi calibre ahal bezain pronto."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -12138,7 +12191,7 @@ msgstr ""
 "duten. Ezin izango dituzu aukera gehiago aldatu edo ezarri calibre "
 "berrabiarazi arte."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Berrabiarazi beharko"
@@ -12948,30 +13001,34 @@ msgid "The main toolbar"
 msgstr "Tresnabarra nagusia"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Tresnabarra nagusia irakurgailua konektaturik dagoenean"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "calibreren liburutegiko liburuetako testuinguruko menua"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Ez dago testuinguruko menurik irakurgailuko liburuentzat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Ezin da gehitu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Ezin da ekintza hau %s kokaleku honetara gehitu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Ezin da ezabatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Ezin dira %s ekintzak ezabatu kokaleku honetatik"
 
@@ -13071,7 +13128,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Bilatu"
@@ -13166,168 +13223,168 @@ msgstr "Egin klik aldatzeko"
 msgid "&Alternate shortcut:"
 msgstr "&Ordezko lasterbidea:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Ezkutatu %s kategoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Erakutsi kategoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Kudeatu %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Kudeatu gordetako bilaketak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Kudeatu erabiltzaile kategoriak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Erakutsi kategoria guztiak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Aldatu azpi-kategorizazio eskema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Liburu multzo batean egileen izenak aldatzeko denbora beharko. Ziur zaude?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Liburu multzo batean metadatuak aldatzeko denbora beharko. Ziur zaude?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Bilaketak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Bilaketa izena bikoiztua"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "%s bilaketa izen hori dagoeneko erabilia izan da."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Bilatu zerbait etiketa arakatzailearekin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13347,64 +13404,64 @@ msgstr ""
 "dira\n"
 "\"jan\" testua daukaten testuak."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+b"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "B&ilatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Bila ezazu aurrekoa edo hurrengoa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Kategoria guztiak murriztu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "Ez dago bat etortze gehiagorik.</b><p> Egin klik berriro Bilatu horretan "
 "lehen bat etortzera joateko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Izenez ordenatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Ospearen arabera ordenatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Ordenatu batezbesteko balorazioen arabera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Ezarri etiketen arakatzaileko sarreren ordena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Bilatu dena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Bilatu edozein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Etiketen arakatzailean hainbat sarrera hautatzen direnean bilatu haietako "
 "bat edo haiek guztiak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Kudeatu &erabiltzaile kategoriak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Gehi ezazu zeuk asmatutako kategoria etiketa arakatzailean"
 
@@ -13484,24 +13541,24 @@ msgstr ""
 "hasiera araztailea erabilgarri egongo da honako fitxategian: %s<p>hori "
 "automatikoki erakutsiko da."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Bihurketa akatsa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Formula desgaitua"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Huts egin du</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Oraintxe bertan lan batzuk egiten ari dira. Ziur zaude irten nahi duzula?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13512,11 +13569,11 @@ msgstr ""
 "daiteke.<br>\n"
 "                      Ziur zaude? Benetan irten nahi duzu?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13726,7 +13783,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Liburu elektronikoen irakurgailua pertsonalizatzeko aukerak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Gogoratu erabilitako azken leiho tamaina"
 
@@ -13811,36 +13868,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Bilatu hiztegian"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Joan horra..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Hurrengo atala"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Aurreko atala"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Documentuaren hasiera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Documentuaren bukaera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Atalaren hasiera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Atalaren amaiera"
 
@@ -13918,77 +13975,77 @@ msgstr "Inprimatze-aurrebista"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Konektatzen dict.org horrekin hauxe bilatzeko: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Aukeratu liburua"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Liburu elektronikoak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Ez da bat etortzerik aurkitu %s horretarako"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Jarioa kargatzen..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Bistarazten %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Laster-marka #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Gehitu laster-marka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Sartu laster-markaren izenburua:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Kudeatu laster-markak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Liburu elektronikoa kargatzen..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Ezin izan da liburua zabaldu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Liburu elektronikoen irakurgailua kontrolatzeko aukerak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Zehazten bada, ikustailearen leihoa saiatuko da aurreko aldera etortzen "
 "hasterakoan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Hauxe hautatu  eginez gero, ikusiko den leihoa saiatuko da pantaila osoa "
 "zabaltzen hasi eta berehalakoan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Inprimatu javascript alerta eta kontsola mezuak kontsolara"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -14066,27 +14123,27 @@ msgstr "Aurkitu aurreko gertaera"
 msgid "Print eBook"
 msgstr "Inprimatu liburu elektronikoa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Letra larriak/xeheak giltza aldatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Trukatu leta xehe/larri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Herrestan eraman tamaina doitzeko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Erakutsi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Txandakatu"
 
@@ -15557,11 +15614,11 @@ msgstr ""
 "\n"
 "Aginduren bati buruz laguntza behar izatekotan: %%prog agindua --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Etiketarik ez da eskaini"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15577,17 +15634,17 @@ msgstr "%sBatezbesteko balorazioa hauxe: %3.1f"
 msgid "Main"
 msgstr "Nagusia"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Migrazioa egiten datu base zaharretik liburu elektronikoen liburutegira "
 "zera honetan: %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopiatzen <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Trinkotzen datu basea"
 
@@ -16699,96 +16756,96 @@ msgstr "Ez deskargatu azken builtin formulen bertsioak calibre zerbitzaritik"
 msgid "Unknown News Source"
 msgstr "Albiste iturri ezezaguna"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 "Honek \"%s\" formula honek erabiltzaile-izena eta pasahitza behar ditu."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Deskarga burutua"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Huts egin du honako artikulu hauek deskargatzerakoan:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "Huts egin du honako artikulu hauen zatiak deskargatzerakoan:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " hemendik "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tEz dabiltzan estekak:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Jarioak eskuratzen..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Jarioak hartuta hasiera orrialdetik"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Liburu-azala deskargatzen saiatzen..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Sortzen idazpurua..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Hasi deskarga [%d haria(k)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Jarioak hona deskargatuta %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Ezin izan da liburu-azala deskargatu: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Deskargatzen liburu-azala hemendik %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Idazpuruko irudia deskargatuta"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Izenbururik gabeko artikulua"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Deskargatutako artikulua: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Huts egin du artikuluaren deskarga: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Jarioa eskuratzen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16796,7 +16853,7 @@ msgstr ""
 "Izena emate saioak huts egin du, azter itzazu zure erabiltzaile-izena eta "
 "pasahitza calibreren Aldian behingo zerbitzurako."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16974,6 +17031,9 @@ msgstr "Ez deskargatu CSS (Cascading Style Sheets) estilo orririk."
 #~ msgid " "
 #~ msgstr " "
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Baliogabeko gehigarria aurkitu da hemen: "
+
 #~ msgid "Communicate with the Promedia eBook reader"
 #~ msgstr "Jar zaitez harremanetan \"Promedia eBook reader\" horrekin."
 
@@ -18176,6 +18236,9 @@ msgstr "Ez deskargatu CSS (Cascading Style Sheets) estilo orririk."
 #~ " Kolore gorriak adierazten du erabiltzen ari garen egile mota honek ez duela "
 #~ "bat egiten erabiltzen ari garen egilearekin"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Banatu tresna barra bi tresna barra berrietan"
+
 #~ msgid ""
 #~ "Search and replace in text fields using regular expressions. The search text "
 #~ "is an arbitrary python-compatible regular expression. The replacement text "
@@ -18400,6 +18463,9 @@ msgstr "Ez deskargatu CSS (Cascading Style Sheets) estilo orririk."
 #~ "Etiketak aldatu dituzu. Etiketa editorea erabiltzeko, aldaketa hauek gaitu "
 #~ "edo ez gaitu beharko dituzu"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Pertsonalizatu tresna-barra"
+
 #~ msgid ""
 #~ "Book formats and metadata from the selected books will be merged into the "
 #~ "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -18696,3 +18762,6 @@ msgstr "Ez deskargatu CSS (Cascading Style Sheets) estilo orririk."
 #~ "gehi erabiltzaileak sortutako eremu pertsonalizatuak.\n"
 #~ "Lehenetsita: '%%default'\n"
 #~ "Aplikatu hauei: CSV, XML irteera formatuak"
+
+#~ msgid "Customize searching"
+#~ msgstr "Pertsonalizatu bilaketa"
diff --git a/src/calibre/translations/fa.po b/src/calibre/translations/fa.po
index 3f5f552d2c..277b53fcff 100644
--- a/src/calibre/translations/fa.po
+++ b/src/calibre/translations/fa.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-06-18 16:56+0000\n"
 "Last-Translator: Milad Naseri <m.m.naseri@gmail.com>\n"
 "Language-Team: Persian <fa@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: 2011-03-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "هیچ کار به خصوصی نمی کند"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "هیچ کار به خصوصی نمی کند"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "هیچ کار به خصوصی نمی کند"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "هیچ کار به خصوصی نمی کند"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "هیچ کار به خصوصی نمی کند"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "هیچ کار به خصوصی نمی کند"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "هیچ کار به خصوصی نمی کند"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "هیچ کار به خصوصی نمی کند"
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "پایه"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "نوع پرونده"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "خواننده ی فراداده"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "نویسنده ی فراداده"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "مولّد کاتالوگ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -333,7 +333,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -343,7 +343,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -665,35 +665,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -701,29 +697,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -745,106 +741,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -888,20 +896,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -909,8 +917,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -920,8 +928,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -929,17 +937,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1238,32 +1246,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1272,29 +1280,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1427,7 +1446,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2064,7 +2083,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2179,7 +2198,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2190,6 +2209,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2539,105 +2562,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3020,7 +3043,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3153,7 +3176,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3319,6 +3342,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3583,135 +3607,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3919,8 +3947,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4117,7 +4145,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4183,7 +4211,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4191,7 +4219,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4372,7 +4400,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4380,32 +4408,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4492,26 +4520,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4519,7 +4547,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4531,7 +4559,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4542,19 +4570,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4619,7 +4647,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4861,7 +4889,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5063,8 +5091,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5074,17 +5102,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5094,25 +5122,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5170,7 +5198,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5193,14 +5221,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5765,10 +5793,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6360,7 +6392,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6945,97 +6977,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7321,7 +7353,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7457,7 +7489,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7504,8 +7536,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7537,12 +7569,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7726,22 +7758,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9221,12 +9253,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9295,7 +9327,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9530,61 +9562,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9598,67 +9630,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9866,48 +9916,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9982,7 +10032,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9999,12 +10049,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10810,25 +10860,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10840,91 +10897,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10933,22 +10990,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10958,64 +11015,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11746,30 +11799,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11866,7 +11923,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11959,166 +12016,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12128,60 +12185,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12254,34 +12311,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12481,7 +12538,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12559,36 +12616,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12664,73 +12721,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12805,27 +12862,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13991,11 +14048,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14009,15 +14066,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15054,101 +15111,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/fi.po b/src/calibre/translations/fi.po
index 2f1583d61b..2b57fb192b 100644
--- a/src/calibre/translations/fi.po
+++ b/src/calibre/translations/fi.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-10-08 20:55+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: 2011-03-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:43+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Ei tee mitään"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Ei tee mitään"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Ei tee mitään"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Kanta"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tiedostotyyppi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metatietojen lukija"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metatietojen kirjoittaja"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalogin luoja"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -335,8 +335,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Lisää/poista sarakkeita calibren kirjaluetteloon"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Mukauta työkalupalkkia"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -345,7 +345,7 @@ msgid ""
 msgstr "Valitse työkalupalkkeissa ja pikavalikkossa näkyvät toiminnot."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -680,35 +680,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Asennetut lisäosat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Tiedostotyyppien lisäosan kuvaus"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Paikallisten lisäosien säätö"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Käytöstä poistetut lisäosat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Käytössä olevat pluginit"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Sopivaa lisäosaa ei löydetty "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "%s lisäosan alustaminen epäonnistui:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -720,17 +716,17 @@ msgstr ""
 "    Säädä calibrea lataamalla ulkoisia lisäosia.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -738,15 +734,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:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Listaa kaikki asennetut lisäosat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Salli nimetty lisäosa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Poista nimetty lisäosa käytöstä"
 
@@ -770,69 +766,81 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Kommunikoi S60-puhelimien kanssa."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
-msgstr "Käytä Sarjaa kategoriana iTunesissa/iBooksissa"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr "Käytä Sarjaa kategoriana iTunesissa/iBooksissa"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Kommunikoi iTunesin/iBooksin kanssa"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Apple-laite havaittu, ladataan iTunes, odota hetki..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Päivittää laitteen metatietolistausta..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d %d:stä"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "Valmis"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -842,7 +850,7 @@ msgstr ""
 "Poista iBooks-sovelluksella.\n"
 "Valitse 'Näytä yksityiskohdat' nähdäksesi listan."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -850,31 +858,31 @@ msgstr ""
 "Osaa kansitaiteesta ei voitu kääntää.\n"
 "Valitse 'Näytä yksityiskohdat' nähdäksesi listan."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Uutiset"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Kommunikoi iTunesin kanssa."
 
@@ -918,20 +926,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Haetaan listaa laitteella olevista kirjoista..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Siirretään kirjoja laitteelle..."
 
@@ -939,8 +947,8 @@ msgstr "Siirretään kirjoja laitteelle..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Lisätään kirjoja laitteen metatietolistaan..."
 
@@ -950,8 +958,8 @@ msgstr "Lisätään kirjoja laitteen metatietolistaan..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Poistetaan kirjoja laitteelta..."
 
@@ -959,17 +967,17 @@ msgstr "Poistetaan kirjoja laitteelta..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Poistetaan kirjoja laitteen metatietolistasta..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Lähetetään metatietoja laitteelle..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1270,15 +1278,15 @@ msgstr "Kommunikoi Sony PRS-500 -lukijan kanssa."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Kommunikoi kaikkien Sony eBook -lukijoiden kanssa."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1286,18 +1294,18 @@ msgstr ""
 "Pilkun erottama lista metatietokentistä, jotka muutetaan kokoelmiksi "
 "laitteella. Vaihtoehtoja ovat: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1306,29 +1314,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1461,7 +1480,7 @@ msgstr "Lisäasetukset"
 msgid "Communicate with an eBook reader."
 msgstr "Kommunikoi lukijan kanssa."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Haetaan laitetietoja..."
 
@@ -2155,7 +2174,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2270,7 +2289,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2281,6 +2300,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2632,105 +2655,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3113,7 +3136,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3246,7 +3269,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3412,6 +3435,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3676,135 +3700,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -4012,8 +4040,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4210,7 +4238,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4276,7 +4304,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4284,7 +4312,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4465,7 +4493,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4473,32 +4501,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4585,26 +4613,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4612,7 +4640,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4624,7 +4652,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4635,19 +4663,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4712,7 +4740,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4954,7 +4982,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5156,8 +5184,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5167,17 +5195,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5187,25 +5215,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5263,7 +5291,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5286,14 +5314,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5858,10 +5886,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6453,7 +6485,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -7038,97 +7070,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7414,7 +7446,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7550,7 +7582,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7597,8 +7629,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7630,12 +7662,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7819,22 +7851,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9314,12 +9346,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9388,7 +9420,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9623,61 +9655,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9691,67 +9723,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9959,48 +10009,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10075,7 +10125,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10092,12 +10142,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10903,25 +10953,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10933,91 +10990,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11026,22 +11083,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11051,64 +11108,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11839,30 +11892,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11959,7 +12016,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -12052,166 +12109,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12221,60 +12278,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12347,34 +12404,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12574,7 +12631,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12652,36 +12709,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12757,73 +12814,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12898,27 +12955,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14084,11 +14141,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14102,15 +14159,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15147,101 +15204,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15355,6 +15412,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr "Älä nouda CSS-tyylisivuja."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Sopivaa lisäosaa ei löydetty "
+
 #~ msgid "Communicate with the Kindle 2 eBook reader."
 #~ msgstr "Kommunikoi Kindle 2 -lukijan kanssa."
 
@@ -15409,3 +15469,6 @@ msgstr "Älä nouda CSS-tyylisivuja."
 
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Kommunikoi Koganin kanssa"
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Mukauta työkalupalkkia"
diff --git a/src/calibre/translations/fo.po b/src/calibre/translations/fo.po
index d6aebc498c..7455834008 100644
--- a/src/calibre/translations/fo.po
+++ b/src/calibre/translations/fo.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-06-11 18:48+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Faroese <fo@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: 2011-03-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:43+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr ""
 msgid "Unknown"
 msgstr "Ókent"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Grund"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Fíluslag"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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 f7f3295a24..2fd5edf918 100644
--- a/src/calibre/translations/fr.po
+++ b/src/calibre/translations/fr.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-26 15:50+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-04 00:02+0000\n"
 "Last-Translator: sengian <Unknown>\n"
 "Language-Team: Français <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: 2011-03-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-04-05 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Bookmarks: 1177,1104,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Ne fait strictement rien"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -34,7 +34,7 @@ msgstr "Ne fait strictement rien"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -51,9 +51,9 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -73,7 +73,7 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -119,19 +119,19 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -139,12 +139,12 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -155,11 +155,11 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -173,46 +173,46 @@ msgstr "Ne fait strictement rien"
 msgid "Unknown"
 msgstr "Inconnu(e)"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Configuration impossible"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Type de fichier"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Lecteur de métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Éditeur de métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Générateur de catalogue"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Action d'interface utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Préférences"
@@ -224,7 +224,7 @@ msgid ""
 "library."
 msgstr ""
 "Suit tous les liens locaux d'un fichier HTML et crée une archive ZIP "
-"contenant tous les fichiers liés. Ce plug-in est lancé chaque fois que vous "
+"contenant tous les fichiers liés. Ce plugin est lancé chaque fois que vous "
 "ajoutez un fichier HTML à la bibliothèque."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:54
@@ -341,8 +341,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Ajouter/retirer vos propres colonnes dans la liste des livres"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Personnaliser la barre d'outils"
+msgid "Toolbar"
+msgstr "Barre d'outils"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -353,8 +353,8 @@ msgstr ""
 "actions disponibles dans ceux-ci"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Personnaliser la recherche"
+msgid "Searching"
+msgstr "Recherche en cours"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -495,7 +495,7 @@ msgstr "Ajouter/Retirer/Modifier diverses fonctionalités de Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1007
 msgid "Tweaks"
-msgstr "Ajustements"
+msgstr "Réglages"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1013
 msgid "Fine tune how calibre behaves in various contexts"
@@ -536,7 +536,7 @@ msgid ""
 "readable as possible. May not have any effect for some output plugins."
 msgstr ""
 "Si spécifié, le plugin de sortie essaiera de créer une sortie qui sera aussi "
-"lisible que possible par l'humain. Peut être sans effet pour quelques "
+"lisible que possible pour un être humain. Peut être sans effet pour quelques "
 "plugins de sortie."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:49
@@ -695,35 +695,32 @@ msgstr "Ce profil est prévu pour le B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Ce profil est prévu pour le Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Plugins installés"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Liaisons pour les plugins d'import/export"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Personnalisation des plugins locaux"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Plugins désactivés."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Plugins activés"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Absence de plugin compatible dans "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
-msgstr "L'initialisation du plugin %s a échoué en laissant une trace :"
+msgstr ""
+"L'initialisation du plugin %s a échoué avec l'erreur suivante (traceback) :"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -735,18 +732,18 @@ msgstr ""
 "    Personnaliser Calibre en chargeant des modules additionnels externes.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -754,15 +751,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:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Lister tous les plugins installés"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Activer le plugin nommé"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Désactive le plugin nommé"
 
@@ -786,43 +783,69 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Communiquer avec les téléphones S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+"<p>Si vous ne voulez pas que Calibre reconaisse votre iAppareil Apple quand "
+"il est connecté à l'ordinateur, cliquez sur <b>Désactiver le driver "
+"Apple</b>.</p><p>Pour transférer les livres sur votre iAppareil, cliquez sur "
+"<b>Désactiver le driver Apple</b>, puis utilisez la méthode 'Connecter à "
+"iTunes' recommandée dans la <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">FAQ "
+"Calibre + iAppareils</a>, en utilisant l'entrée de menu "
+"<em>Connecter/Partager</em>|<em>Connecter à iTunes</em>.</p><p>Activer les "
+"driver Apple pour une connection directe aux iAppareils est une mode pour "
+"utilisateur avancé non supporté.</p><p></p>"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr "Désactiver le pilote de périphériques Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr "Activer le pilote de périphériques Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Utiliser Séries comme Catégorie dans iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
+"Activer l'utilisation du nom des séries en tant que genre iTunes et "
+"catégorie iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Mettre en cache les couvertures provenant d'iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
+"Activer la mise en cache et l'affichage des couvertures provenant de "
+"iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Appareil Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Communiquer avec iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Appareil Apple détecté, lancement d'iTunes, veuillez patienter..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -831,27 +854,27 @@ msgstr ""
 "le bureau à partir de la bibliothèque, puis ajouter à la fenêtre de la "
 "bibliothèque Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Mise à jour de la liste des métadonnées de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d sur %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "Terminé"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -861,7 +884,7 @@ msgstr ""
 "Les supprimer en utilisant l'application iBooks.\n"
 "Cliquer 'Afficher détails' pour obtenir la liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -869,31 +892,31 @@ msgstr ""
 "Certaines illustrations de couverture n'ont pu être converties.\n"
 "Cliquer sur 'Afficher Détails' pour une liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Informations"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catalogue"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Communiquer avec iTunes"
 
@@ -945,20 +968,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Lit la liste des livres de l'appareil..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Transfère les livres vers l'appareil..."
 
@@ -966,8 +989,8 @@ msgstr "Transfère les livres vers l'appareil..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Ajoute les livres à liste des métadonnées de l'appareil..."
 
@@ -977,8 +1000,8 @@ msgstr "Ajoute les livres à liste des métadonnées de l'appareil..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Supprime les livres de l'appareil..."
 
@@ -986,17 +1009,17 @@ msgstr "Supprime les livres de l'appareil..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 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/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Envoie les métadonnées vers l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Le SDK Bambook n'a pas été installé"
 
@@ -1312,15 +1335,15 @@ msgstr "Communique avec le lecteur d'ebook Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Communiquer avec tous les lecteurs d'eBook Sony"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Tous par titre"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Tous par auteur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1328,7 +1351,7 @@ msgstr ""
 "Liste de métadonnées séparées par des virgules, transformées en collection "
 "dans l'appareil. Les possibilités sont les suivantes : "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1338,12 +1361,12 @@ msgstr ""
 "valeurs à la liste pour les activer. Les collections auront le nom indiqué "
 "après les deux points."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 "L'Upload sépare la vignette de couverture des livres (nouveaux lecteurs)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1358,14 +1381,14 @@ msgstr ""
 "AVERTISSEMENT: Cette option ne doit être utilisée qu'avec des lecteurs SONY "
 "récents: 350, 650, 950 et plus récents."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Rafraîchir les couvertures séparées quand la gestion automatique est "
 "utilisée (nouveaux lecteurs)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1376,13 +1399,13 @@ msgstr ""
 "option si vous avez tant de livres sur le lecteur que les performances "
 "deviennent inacceptables."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 "Conserver les proportions de la couverture lors de la génération des "
 "vignettes"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1393,6 +1416,17 @@ msgstr ""
 "couverture. Désactivez cette option si vous voulez que la vignette soit de "
 "taille maximum, en ignorant les proportions."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr "Rechercher les livres dans tous les dossiers"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1532,7 +1566,7 @@ msgstr "Personnalisation complémentaire"
 msgid "Communicate with an eBook reader."
 msgstr "Communiquer avec un lecteur d'ebook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Lit les informations de l'appareil..."
 
@@ -2403,7 +2437,7 @@ msgstr "Conversion de l'entrée en HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Démarrage des transformations de l'ebook...."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Création"
 
@@ -2566,7 +2600,7 @@ msgstr "Démarrer"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Ne pas insérer une table des matières au début du livre."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2586,6 +2620,10 @@ msgstr ""
 " (active \"Force use of auto-generated Table of Contents\" (forcer "
 "l'utilisation d'une table des matières auto-générée))"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr "pour une liste compléte avec les descriptions."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2997,105 +3035,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "ERREUR DE MODELE"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Non"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Oui"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Titre"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Éditeur"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producteur"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Commentaires"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Séries"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Langue"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Horodatage"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Publié"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Droits"
 
@@ -3547,13 +3585,13 @@ msgstr "RU"
 msgid "Amazon timed out. Try again later."
 msgstr "Amazon : délai de connexion dépassé. Veuillez réessayer plus tard."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Source de métadonnées"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/openlibrary.py:15
 msgid "Downloads metadata from The Open Library"
-msgstr ""
+msgstr "Télécharge les metadonnées à partir de The Open Library"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
@@ -3689,7 +3727,7 @@ msgid "HTML TOC generation options."
 msgstr "Options pour la génération des tables de matières HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3891,6 +3929,7 @@ msgid "Author"
 msgstr "Auteur"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Sujet"
 
@@ -4254,77 +4293,81 @@ msgstr ""
 "output-formatting qui n'est pas nulle car les références à des images sont "
 "toujours supprimées avec la sortie texte classique."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Par défaut, envoyer le fichier dans la carte mémoire à la place de la "
 "mémoire principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Confirmer avant la suppression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Géométrie de l'écran principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Avertir lorsqu'une nouvelle version est disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 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/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Trier la liste d'étiquettes par nom, popularité ou note (classement)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr "Faire correspondre les étiquettes par n'importe laquelle ou toutes."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Nombre de couvertures à afficher dans le mode de navigation par couverture"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Valeurs par défaut pour la conversion vers LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Options pour l'afficheur d'ebook LFR"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formats qui sont affichés par l'afficheur interne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Colonnes affichées dans la liste de livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Démarrer automatiquement le serveur de contenu au démarrage de l'application"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Anciennes informations conservées dans la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Afficher l'icône dans la zone de notification"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Envoyer les News téléchargées vers l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 "Supprimer les livres de la bibliothèque après les avoir téléchargés dans "
 "l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4332,16 +4375,16 @@ msgstr ""
 "Afficher la navigation par couverture dans une fenêtre séparée au lieu de la "
 "fenêtre principale de Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Désactiver les alertes dans la zone de notification"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Action par défaut à réaliser quand le bouton 'envoyer au lecteur' est cliqué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4349,7 +4392,7 @@ msgstr ""
 "Démarrer la recherche lors de la frappe. Si c'est désactivé alors la "
 "recherche n'aura lieu que lorsque la touche Enter ou Return sera pressée."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
@@ -4360,46 +4403,46 @@ msgstr ""
 "pouvez utiliser N ou la touche F3 pour vous déplacer jusqu'au résultat "
 "suivant."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Nombre maximum de processus de travail en attente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Télécharger les métadonnées sociales (étiquettes, classement, etc.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Remplacer l'auteur et le titre avec de nouvelles métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 "Télécharger automatiquement la couverture, si celle-ci est disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 "Limiter le nombre maximum de travaux simultanés au nombre de processeurs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "La présentation de l'interface utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Afficher la note moyenne par article dans le navigateur d'étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Désactiver les animations de IU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "catégories du navigateur d'étiquettes à ne pas afficher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Choisir les fichiers"
 
@@ -4624,8 +4667,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Aucun livre sélectionné"
@@ -4833,7 +4876,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4909,7 +4952,7 @@ msgid "Bulk convert"
 msgstr "Convertir par lot"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Conversion impossible"
 
@@ -4917,7 +4960,7 @@ msgstr "Conversion impossible"
 msgid "Starting conversion of %d book(s)"
 msgstr "Démarrer la conversion de %d livre(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "Fichier de sortie vide, le processus de conversion a probablement cessé de "
@@ -5112,7 +5155,7 @@ msgid "Stop Content Server"
 msgstr "Arrêter le serveur de contenu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Email vers"
 
@@ -5120,32 +5163,32 @@ msgstr "Email vers"
 msgid "Email to and delete from library"
 msgstr "Envoyer par email et supprimer de la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(supprimer de la bibliothèque)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Configurer le partage des livres par email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Envoyer au lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Connecter/Partager"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Arrêt en cours"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -5236,20 +5279,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Télécharge {0} sur {1} livre(s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Impossible d'éditer les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Impossible de fusionner les livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5257,7 +5300,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5269,7 +5312,7 @@ msgstr ""
 "fusionné.<br><br> Le second livre sélectionné et les suivants ne seront ni "
 "supprimés ni modifiés.<br><br>Veuillez confirmer que vous voulez continuer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5291,7 +5334,7 @@ msgstr ""
 "<b>supprimés</b> de manière permanente de votre bibliothèque "
 "Calibre.<br><br> Êtes vous <b>sûr</b> de vouloir continuer?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5310,19 +5353,19 @@ msgstr ""
 "permanente de votre bibliothèque Calibre.<br><br> Êtes vous <b>sûr</b> de "
 "vouloir continuer?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Récupérer des News"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Récupération des News de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " récupéré."
 
@@ -5387,7 +5430,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Démarrer l'assistant de bienvenue"
 
@@ -5643,7 +5686,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:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Aucun livre"
 
@@ -5864,8 +5907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Chemin"
 
@@ -5875,17 +5918,17 @@ msgstr "Chemin"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formats"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Collections"
 
@@ -5895,25 +5938,25 @@ msgid "Click to open"
 msgstr "Cliquer pour ouvrir"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Aucun"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Coller la couverture"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Copier la couverture"
 
@@ -5971,7 +6014,7 @@ msgstr "sortie"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5994,14 +6037,14 @@ msgstr "sortie"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6603,10 +6646,14 @@ msgstr "Ne pas insérer une &Table des Matières au début du livre."
 msgid "FB2 Output"
 msgstr "Sortie FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Diviser en sections :"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr "Genre"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Assistant de redimensionnent de la police"
@@ -7240,7 +7287,7 @@ msgid "Regex:"
 msgstr "Expression régulière :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7438,7 +7485,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove &fake margins"
-msgstr ""
+msgstr "Supprimer les &fausses marges"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
@@ -7864,21 +7911,21 @@ msgstr "Erreur"
 msgid "Error communicating with device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Pas de format convenable"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Sélectionner le dossier à ouvrir comme appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7887,69 +7934,69 @@ msgstr ""
 "lecteur électronique. Veuillez déconnecter et reconnecter le lecteur "
 "électronique et redémarrer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Appareil : "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /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:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "Livre %i de %i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "Livre 0 de %i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Choisir le format à envoyer au lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Aucun appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Impossible d'envoyer : Aucun appareil n'est connecté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Aucune carte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Envoie les catalogues vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Envoi les News vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Envoie les livres dans l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7958,11 +8005,11 @@ msgstr ""
 "convenable n'a été trouvé. Convertissez avant le(s) livre(s) vers un format "
 "supporté par votre appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Le lecteur électronique n'a plus d'espace mémoire disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -8363,7 +8410,7 @@ msgstr "Choisir le format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -8507,7 +8554,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Annuler"
 
@@ -8556,8 +8603,8 @@ msgid "Location"
 msgstr "Emplacement"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8596,12 +8643,12 @@ msgid "Author sort"
 msgstr "Clé de tri par auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Nom de l'auteur erroné"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Les noms d'auteurs ne peuvent pas contenir le caractère &"
 
@@ -8805,22 +8852,22 @@ msgid "Working"
 msgstr "En cours"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Minuscule"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Majuscule"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Casse du titre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Mettre en majuscules"
 
@@ -10333,7 +10380,7 @@ msgstr " (n'est sur aucun livre)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:146
 msgid "Category lookup name: "
-msgstr ""
+msgstr "Nom de recherche de la catégorie : "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:191
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:222
@@ -10346,6 +10393,8 @@ msgid ""
 "That name contains leading or trailing periods, multiple periods in a row or "
 "spaces before or after periods."
 msgstr ""
+"Le nom contient des points avant ou après le nom, plusieurs point à la suite "
+"ou des espaces avant ou après les points."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:200
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:230
@@ -10484,12 +10533,12 @@ msgid "%s (was %s)"
 msgstr "%s (autrefois %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "L'article est vide"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 "Un article ne peut être défini à une valeur nulle. Supprimez le à la place."
@@ -10562,7 +10611,7 @@ msgid "Send test mail from %s to:"
 msgstr "Envoyer un email de test de %s vers :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -10821,65 +10870,65 @@ msgstr "Le téléchargement a échoué."
 msgid "Failed to download from %r with error: %s"
 msgstr "Echec de téléchargement depuis %r avec l'erreur : %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Envoyer par mél %s à %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "News :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Trouvez en pièce jointe le périodique %s téléchargé par Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-book :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "En pièce jointe, vous trouverez l'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "par"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "dans le format %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Envoi d'un email à"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 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/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Echec de l'envoi du livre par mél"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "envoyé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Envoi des News vers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10904,67 +10953,85 @@ msgstr ""
 "différentes entrées de métadonnées sont documentés dans les infos-"
 "bulles.</p></div>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "&Expression régulière"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Nom du fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Titre :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Expression régulière (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Pas de correspondance"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Auteurs :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Expression régulière (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Séries :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Expression régulière (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Index de séries :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Expression régulière (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Expression régulière (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr "Maison d'edition :"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr "Expression régulière (?P<publisher>) (Maison d'édition)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr "Publié :"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr "Expression régulière (?P<published>) (publié)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Navigateur de couvertures"
@@ -11181,48 +11248,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Editer le modèle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Taille (Mo)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Livre %s sur %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Le nom recherché/consulté est \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "L'UUID de ce livre est \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "Dans la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Taille"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Marqué pour suppression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Double clic pour m' <b>éditer</b><br><br>"
 
@@ -11299,7 +11366,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Aucun résultat</b> pour la recherche <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Aucun résultat"
 
@@ -11316,12 +11383,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Barre d'outil pour l'afficheur LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Page suivante"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Page précédente"
 
@@ -11734,7 +11801,7 @@ msgstr "Haute"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:36
 msgid "Very low"
-msgstr ""
+msgstr "Très faible"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:164
 msgid "Confirmation dialogs have all been reset"
@@ -11942,7 +12009,7 @@ msgstr "Modifier la date"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 msgid "People's names"
-msgstr ""
+msgstr "Le nom des gens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 msgid "Number"
@@ -11984,7 +12051,7 @@ msgstr "Ma note"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:150
 msgid "People"
-msgstr ""
+msgstr "Les gens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:179
 msgid "No lookup name was provided"
@@ -12078,16 +12145,18 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:199
 msgid "Show checkmarks"
-msgstr ""
+msgstr "Montrer les marques cochées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:200
 msgid ""
 "Check this box if this column contains names, like the authors column."
 msgstr ""
+"Cocher cette case si cette colonne contient des noms, comme la colonne des "
+"auteurs"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:201
 msgid "Contains names"
-msgstr ""
+msgstr "Contiens les noms"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:202
 msgid ""
@@ -12214,20 +12283,31 @@ msgstr "Par &défaut"
 msgid "&Remove email"
 msgstr "&Supprimer un email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Envoyer automatiquement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 "Formats à envoyer par email. Le premier format qui correspond sera envoyé."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+"Sujet du mél à utiliser lors de l'envoi. Quand celui-ci est laissé blanc, le "
+"titre sera utilisé comme sujet. Les modèles utilisés pour \"Sauvegarder sur "
+"le disque\" comme {title} et {author_sort} peuvent également être utilisés "
+"ici."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -12235,7 +12315,7 @@ msgstr ""
 "Si coché, les News téléchargées seront automatiquement envoyées par email "
 "<br>à cette adresse (à condition qu'il appartienne à un des formats listés)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "Nouvelle adresse email"
 
@@ -12247,99 +12327,99 @@ msgstr "Etroit"
 msgid "Wide"
 msgstr "Large"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Moyen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Petit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Large"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Toujours"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Jamais"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Par la première lettre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Partitionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 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/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Choisir la &langue (nécessite un redémarrage) :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 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/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 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/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Désactiver les &animations"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 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/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Afficher l'&écran d'accueil au démarrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Désactiver l'affichage des alertes dans la zone de &notification"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Utiliser des chiffres &romains pour les séries"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 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/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
-msgstr ""
+msgstr "Méthode de division des catégories du navigateur d'étiquettes :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -12354,11 +12434,11 @@ msgstr ""
 "avoir une liste de groupes de tailles fixes. Indiquer désactiver\n"
 " si vous ne voulez pas de sous-catégories."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr "Minimiser quand le nombre d'élements dépasse :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -12368,11 +12448,11 @@ msgstr ""
 "d'articles, ceci est divisé en sous-catégories. Si la méthode partition est "
 "désactivée, cette valeur est ignorée."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr "Catégories avec des articles hiérarchiques:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -12382,52 +12462,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Taille d'&icone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Afficher le &texte sous les icônes :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Sépare la barre d'outils en deux barres distinctes"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Police de l'interface :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Modifier la &police (rdémarrage nécessaire)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Appliquer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Restaurer les valeurs par &défaut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Annuler et retourner à la vue d'ensemble"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "La restauration des valeurs par défaut n'est pas supportée pour"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -12435,7 +12511,7 @@ msgstr ""
 "Certains des changements que vous avez effectués nécessitent le redémarrage "
 "de Calibre. Veuillez redémarrer Calibre dès que possible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -12444,7 +12520,7 @@ msgstr ""
 "de Calibre. Vous ne serez pas autorisé à modifier les préférences avant le "
 "redémarrage."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Redémarrage nécessaire"
@@ -12859,16 +12935,18 @@ msgstr "Le champ de valeur ne peut pas être vide"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:129
 msgid "The empty grouped search term cannot be deleted"
-msgstr ""
+msgstr "Une recherche groupée vide ne peut être effacée"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:110
 msgid "Search as you &type"
-msgstr ""
+msgstr "Rechercher en même temps que vous &tapez"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:111
 msgid ""
 "&Highlight search results instead of restricting the book list to the results"
 msgstr ""
+"&Surligner les livres correspondants aux résultats de la recherche au lieu "
+"de restreindre la liste aux résultats"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:112
 msgid "What to search by default"
@@ -12893,7 +12971,7 @@ msgstr "&Limiter les métadonnées recherchées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:115
 msgid "&Columns that non-prefixed searches are limited to:"
-msgstr ""
+msgstr "Les &colonnes permettant une recherche groupée sans préfixe :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:116
 msgid ""
@@ -12908,6 +12986,8 @@ msgid ""
 "Clear search histories from all over calibre. Including the book list, e-"
 "book viewer, fetch news dialog, etc."
 msgstr ""
+"Vide les historiques de recherche de Calibre. Sont inclus la liste des "
+"livres, le visualisateur d'ebooks, le dialogue de récupération des news, etc."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:118
 msgid "Clear search &histories"
@@ -12943,13 +13023,15 @@ msgstr "&Sauvegarder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:132
 msgid "Make &user categories from:"
-msgstr ""
+msgstr "Créer les catégories &utilisateur à partir de :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:133
 msgid ""
 "Enter the names of any grouped search terms you wish\n"
 "to be shown as user categories"
 msgstr ""
+"Entrez les noms de n'importe quelle recherche groupée que vous souhaitez\n"
+"afficher comme catégories utilisateur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:70
@@ -13335,30 +13417,34 @@ msgid "The main toolbar"
 msgstr "La barre d'outils principale"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr "La seconde barre d'outils optionelle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "La barre d'outils principale quand un appareil est connecté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Le menu contextuel pour les livres dans la bibliothèque Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Le menu contextuel pour les livres dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Impossible d'effectuer un ajout"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Impossible d'ajouter les actions %s à cet emplacement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Impossible d'effacer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Impossible d'effacer les actions %s de cet emplacement"
 
@@ -13392,11 +13478,11 @@ msgstr "Supprimer les actions sélectionnées de la barre d'outils"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:113
 msgid "This tweak has it default value"
-msgstr ""
+msgstr "Ce réglage posséde sa valeur par défaut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:115
 msgid "This tweak has been customized"
-msgstr ""
+msgstr "Ce réglage a été personnalisé"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:236
 msgid ""
@@ -13411,6 +13497,8 @@ msgid ""
 "There was a syntax error in your tweak. Click the show details button for "
 "details."
 msgstr ""
+"Il y a eu une erreur de syntaxe dans votre réglage. Appuyez sur le bouton "
+"afficher les détails pour obtenir les détails."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:330
 msgid "Invalid tweaks"
@@ -13435,30 +13523,32 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:89
 msgid "Edit tweaks for any custom plugins you have installed"
 msgstr ""
+"Editer les réglages pour n'importe lequels des plugins personnalisés que "
+"vous avez installlé"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:90
 msgid "&Plugin tweaks"
-msgstr ""
+msgstr "Réglages du &plugin"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:92
 msgid "Edit tweak"
-msgstr ""
+msgstr "Editer les réglages"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:93
 msgid "Restore this tweak to its default value"
-msgstr ""
+msgstr "Restaurer ce réglage à sa valeur par défaut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:94
 msgid "Restore &default"
-msgstr ""
+msgstr "Restaurer la valeur par &défaut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:95
 msgid "Apply any changes you made to this tweak"
-msgstr ""
+msgstr "Appliquer les changements que vous avez effectués à ce réglage"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Trouver"
@@ -13556,172 +13646,172 @@ msgstr "Cliquer pour modifier"
 msgid "&Alternate shortcut:"
 msgstr "Raccourci &alternatif :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Renommer %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr "Editer le tri pour %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr "Ajouter %s à la catégorie utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr "Enfants de %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr "Supprimer la recherche %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr "Supprimer %s de la catégorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Rechercher %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "Rechercher tout sauf %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr "Ajouter la sous-catégorie à %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr "Supprimer la catégorie utilisateur %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Cacher la catégorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Afficher la catégorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Rechercher les livres dans la catégorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "Rechercher les livres qui ne sont pas dans la catégorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Gérer %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Gérer les Recherches Sauvegardées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Gérer les Catégories définies par l'Utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Afficher toutes les catégories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Modifier le schéma des sous-catégories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr "Le nom du terme de recherche groupée est \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Changer les auteurs pour plusieurs livres peut prendre un certain temps. "
 "Etes-vous sûr?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Changer les métadonnées pourautant de livres peut prendre un certain temps. "
 "Etes-vous sûr?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Recherches"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr "Renommer la catégorie utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 "Vous ne pouvez pas utiliser des points dans les noms pour renommer les "
 "catégories d'utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr "Le nom %s est déjà utilisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Nom de recherche en double"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "Le nom de la recherche sauvegardé %s est déjà utilisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr "Nouvelle catégorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr "Supprimer une catégorie utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr "%s n'est pas une catégorie utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr "%s contient des articles. Voulez-vous vraiment le supprimer?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr "Supprimer la catégorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr "La catégorie utilisateur %s n'existe pas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr "Ajouter à la catégorie utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr "Une catégorie utilisateur %s n'existe pas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Chercher un article dans le navigateur d'étiquette"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13742,64 +13832,64 @@ msgstr ""
 "articles\n"
 "contenant le texte \"foo\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "C&hercher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Chercher le premier/prochain article correspondant"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Replier toutes les catégories"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "Plus de résultat.</b><p> Cliquer Chercher à nouveau pour aller au premier "
 "résultat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Trier par nom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Trier par popularité"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Trier par note moyenne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 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:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Toutes les correspondances"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Aucune correspondance"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Gérer les catégories de l'&utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Ajouter vos propres catégories au navigateur d'étiquettes"
 
@@ -13879,23 +13969,23 @@ msgstr ""
 "Calibre, le journal de débogage sera disponible dans le fichier : %s<p>Le "
 "journal sera affiché automatiquement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Recette désactivée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Échoué</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13906,11 +13996,11 @@ msgstr ""
 "l'appareil.<br>\n"
 "                      Êtes-vous sûr de vouloir quitter ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Travaux actifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -14121,7 +14211,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Options pour personnalier l'afficheur d'ebook"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Se souvenir de la dernière taille de fenêtre utilisée"
 
@@ -14209,36 +14299,36 @@ msgstr ""
 "opération en cliquant en dehors de la boite de dialogue d'édition de "
 "raccourci."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Rechercher dans le dictionnaire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Aller vers..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Section suivante"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Section précédente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Début du document"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Fin du document"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Début de la section"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Fin de la section"
 
@@ -14316,78 +14406,78 @@ msgstr "Aperçu avant impression"
 msgid "Clear list of recently opened books"
 msgstr "Effacer la liste des livres ouverts récemment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Connexion à dict.org pour rechercher : <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Choisir un ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Pas de correspondance trouvée pour : %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Chargement du flux..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Aménagement de %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Marque-page #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Ajouter un signet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Entrer un titre pour le signet :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Gérer les Signets"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Charge l'ebook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Impossible d'ouvrir l'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Options pour contrôler l'afficheur d'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Si spécifié, la fenêtre de l'afficheur essaiera d'apparaitre au premier plan "
 "au lancement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Si précisé, la fenêtre de l'afficheur essaiera de s'ouvrir en plein écran au "
 "démarrage."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 "Afficher les alertes javascript et les messages console dans la console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -14465,27 +14555,27 @@ msgstr "Rechercher l'occurence précédente"
 msgid "Print eBook"
 msgstr "Imprimer un ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Modifier la casse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Basculer la casse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Faire glisser pour redimensionner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Afficher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Masquer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Basculer"
 
@@ -14716,6 +14806,8 @@ msgid ""
 "You must either set both the username <b>and</b> password for the mail "
 "server or no username and no password at all."
 msgstr ""
+"Vous devez soit entrer à la fois les valeurs pour le nom d'utilisateur "
+"<b>et</b> le mot de passe du serveur de courrier soit aucun des deux."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:219
 msgid "Please enter a username and password or set encryption to None "
@@ -15258,6 +15350,14 @@ msgid ""
 "Select all books by '{0}', apply correct Author Sort value in Edit Metadata "
 "dialog, then rebuild the catalog.\n"
 msgstr ""
+"Les valeurs des clés de Tri par auteur sont incohérentes pour\n"
+"Auteur '{0}':\n"
+"'{1}' <> '{2}'\n"
+"Impossible de créer le catalogue MOBI.\n"
+"\n"
+"Sélectionnez tous les livre de  '{0}', appliquez une valeur correcte pour la "
+"clé de Tri par auteur dans le dialogue d'édition des métadonnées, puis "
+"recréez le catalogue.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:1504
 msgid ""
@@ -15265,6 +15365,9 @@ msgid ""
 "Author '{0}':\n"
 "'{1}' <> '{2}'\n"
 msgstr ""
+"Attention : les valeurs des clés de Tri par auteur sont incohérentes pour\n"
+"Auteur '{0}':\n"
+"'{1}' <> '{2}'\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:1700
 msgid ""
@@ -16021,11 +16124,11 @@ msgstr ""
 "\n"
 "Pour une aide sur commande précise : %%prog commande --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Aucune étiquette n'a été fournie"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -16041,15 +16144,15 @@ msgstr "La note moyenne de %sest %3.1f"
 msgid "Main"
 msgstr "Principal"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migre l'ancienne base vers la bibliothèque dans %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Copie <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Compacte la base"
 
@@ -16543,6 +16646,10 @@ msgid ""
 "and consume more resources. Most tasks like conversion/news download/adding "
 "books/etc. are affected by this setting."
 msgstr ""
+"La priorité des processus de travail autonomes. Une priorité supérieure "
+"siginifie qu'ils fonctionnent plus vite et consomment plus de ressources. La "
+"plupart des taches commme la conversion/le téléchargement des news/l'ajout "
+"des livres/etc sont affectées par ce réglage."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:722
 msgid "Swap author first and last names when reading metadata"
@@ -16574,6 +16681,9 @@ msgid ""
 "When searching for text without using lookup prefixes, as for example, Red "
 "instead of title:Red, limit the columns searched to those named below."
 msgstr ""
+"Quand vous recherchez du texte sans utiliser de préfixe de recherche, comme "
+"par exemple, Rouge au lieu de titre:Rouge, les colonnes recherchées sont "
+"limitées à celles nommées ci-dessous."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:740
 msgid ""
@@ -16752,6 +16862,8 @@ msgid ""
 "raw_field(name) -- returns the metadata field named by name without applying "
 "any formatting."
 msgstr ""
+"raw_field(nom) -- renvoie le champ de métadonnées nom sans appliquer aucune "
+"mise en forme."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:246
 msgid ""
@@ -16905,6 +17017,9 @@ msgid ""
 "with the items being \"id:value\". Find the pair with theid equal to key, "
 "and return the corresponding value."
 msgstr ""
+"select(valeur, clé) -- interpréte valeur comme une liste d'items séparés par "
+"des virgules, les items étant de la forme \"id:value\". Trouve la paire dont "
+"l'id est égale à la clé, et retourne la valeur correspondante."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:429
 msgid ""
@@ -17239,98 +17354,98 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Source de News inconnue"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Téléchargement terminé"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tLiens qui ont échoués :"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "Impossible de récupérer l'article."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 "Les informations de débogage sont disponibles précédement dans ce journal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr "Lancer avec -vv pour voir la raison"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Récupération des flux..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 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:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Essaie de télécharger la couverture..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Génération du masthead"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Commence le téléchargement [processus %d]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Flux téléchargés de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 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:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Télécharge la couverture de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 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:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Article sans titre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Article téléchargé : %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Impossible de télécharger l'article : %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Récupération du flux"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -17338,7 +17453,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -18008,9 +18123,6 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "%prog [options] myebook.mobi"
 #~ msgstr "%prog [options] myebook.mobi"
 
-#~ msgid "Toolbar"
-#~ msgstr "Barre d'outils"
-
 #~ msgid "Free unused diskspace from the database"
 #~ msgstr "Espace libre non-utilisé de la base de données"
 
@@ -20739,6 +20851,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "Add the new category"
 #~ msgstr "Ajouter la nouvelle catégorie"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Absence de plugin compatible dans "
+
 #~ msgid ""
 #~ "Scale used to determine the length at which a line should be unwrapped. "
 #~ "Valid values are a decimal between 0 and 1. The default is 0.5, this is the "
@@ -21275,6 +21390,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ "numeros ISBN et télécharger les métadonnées et les couvertures "
 #~ "correspondates.<p>Tout numéro ISBN incorrect de la liste sera ignoré."
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Personnaliser la barre d'outils"
+
 #~ msgid "Include 'Series' Section"
 #~ msgstr "Inclure la section 'Series'"
 
@@ -21847,6 +21965,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ "Vous pouvez vous enregistrer pour un compte mél {name} gratuit à <a "
 #~ "href=\"http://{url}\">http://{url}</a>. {extra}"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Sépare la barre d'outils en deux barres distinctes"
+
 #~ msgid ""
 #~ "The following books had formats or covers listed in the database that are "
 #~ "not actually available. The entries for the formats/covers have been "
@@ -22375,3 +22496,6 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 
 #~ msgid "Downloads series information from ww2.kdl.org"
 #~ msgstr "Télécharge les informations des séries de ww2.kdl.org"
+
+#~ msgid "Customize searching"
+#~ msgstr "Personnaliser la recherche"
diff --git a/src/calibre/translations/gl.po b/src/calibre/translations/gl.po
index 36d265a6eb..8c84dbcdba 100644
--- a/src/calibre/translations/gl.po
+++ b/src/calibre/translations/gl.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-25 21:37+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-07 18:57+0000\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: dev@gl.openoffice.org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-27 04:40+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-08 04:43+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 "Language: gl\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Non facer nada"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -33,7 +33,7 @@ msgstr "Non facer nada"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -50,9 +50,9 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -72,7 +72,7 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -118,19 +118,19 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -138,12 +138,12 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -154,11 +154,11 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -172,46 +172,46 @@ msgstr "Non facer nada"
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personalizar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Non é posíbel configurar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tipo de ficheiro"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Lector de metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadata writer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Catalog generator"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Acción da interface de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferencias"
@@ -250,6 +250,9 @@ msgid ""
 "Textile references to images. The referenced images as well as the TXT file "
 "are added to the archive."
 msgstr ""
+"Crear un arquivo TXTZ cando se importa un ficheiro TXT que contén "
+"referencias a imaxes con Markdown ou Textile. O arquivo inclúe tanto as "
+"imaxes como o ficheiro TXT."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
 msgid "Extract cover from comic files"
@@ -336,8 +339,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Engadir/retirar as columnas propias da lista de libros do Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Personalizar a barra de ferramentas"
+msgid "Toolbar"
+msgstr "Barra de ferramentas"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -348,8 +351,8 @@ msgstr ""
 "accións que estarán dispoñíbeis en cada un"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Personalizar as buscas"
+msgid "Searching"
+msgstr "Busca"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -688,35 +691,31 @@ msgstr "Este perfil está orientado a B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Este perfil está pensado para o Sandra Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Engadidos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapeando por engadidos de ficheiro"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Personalización de engadido local"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Engadidos desactivados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Engadidos activados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Non se atoparon engadidos correctos en "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -728,18 +727,18 @@ msgstr ""
 "    Personalice Calibre cargando engadidos externos.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Engadir un engadido especificando a ruta ao ficheiro zip que o contén."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Retirar un engadido persoal polo nome. Non afecta aos engadidos incorporados "
 "no programa."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -747,15 +746,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:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Listar todos os engadidos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Activar o engadido sinalado"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Desactivar o engadido sinalado"
 
@@ -779,44 +778,71 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunicar con teléfonos S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+"<p>Se non quere que Calibre recoñeza o seu dispositivo Apple ao conectalo ao "
+"computador, prema en «<b>Desactivar o controlador de Apple</b>».</p>\r\n"
+"<p>Para transferirlle libros ao dispositivo, prema en «<b>Desactivar o "
+"controlador de Apple</b>» e logo use o método de «Conexión con iTunes» "
+"recomendado na <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, usando o menú «<em>Conectar/compartir</em>|<em>Conectar a "
+"iTunes</em>».</p>\r\n"
+"<p>A activación do controlador de Apple para conectar directamente cos "
+"dispositivos de Apple é unha opción avanzada e sen asistencia "
+"técnica.</p>\r\n"
+"<p></p>"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr "Desactivar o controlador de Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr "Activar o controlador de Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Usar Serie como categoría en iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
+"Actíveo para usar o nome da serie como xénero de iTunes ou categoría de "
+"iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Gardar as cubertas de iTunes/iBooks en caché"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
+"Actíveo para amosar e gardar en caché as portadas de iTunes ou iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Dispositivo Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Comunicar con iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "Detectouse un dispositivo de Apple. Estase a iniciar o iTunes, agarde..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -825,27 +851,27 @@ msgstr ""
 "biblioteca de iTunes ao escritorio, e logo, poderá engadilos na xanela "
 "Biblioteca de Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Actualizando a relación de metadatos..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "rematado"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -855,7 +881,7 @@ msgstr ""
 "Eliminar co aplicativo do iBooks\n"
 "Premer «Amosar detalles» para obter unha lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -863,31 +889,31 @@ msgstr ""
 "Algunhas cubertas non se converteron. \n"
 "Prema «Amosar detalles» para relacionalas."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Noticias"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Comunicar con iTunes."
 
@@ -937,20 +963,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Obtendo a lista de libros do dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Transferindo os libros ao dispositivo..."
 
@@ -958,8 +984,8 @@ msgstr "Transferindo os libros ao dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Engadindo libros á lista de metatados do dispositivo..."
 
@@ -969,8 +995,8 @@ msgstr "Engadindo libros á lista de metatados do dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Retirando os libros do dispositivo..."
 
@@ -978,17 +1004,17 @@ msgstr "Retirando os libros do dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Retirando libros da lista de metatados do dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Enviando metadatos ao dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "O SDK do Bambook non está instalado."
 
@@ -1166,6 +1192,10 @@ msgid ""
 "the Kindle when uploading MOBI files by USB. Note that the page numbers do "
 "not correspond to any paper book."
 msgstr ""
+"O Kindle 3 e versións máis recentes poden usar información sobre números de "
+"páxinas en ficheiros MOBI. Con esta opción, Calibre calculará e enviaralle "
+"esta información ao Kindle ao copiar ficheiros MOBI a través de USB. Teña en "
+"conta que os números de páxina non se corresponden con ningún libro en papel."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:187
 msgid "Use slower but more accurate page number generation"
@@ -1180,6 +1210,10 @@ msgid ""
 "book. However, this method is slower and will slow down sending files to the "
 "Kindle."
 msgstr ""
+"Hai dúas maneiras de xerar a información de números de páxinas. O uso do "
+"algoritmo máis preciso xera números que resultan máis parecidos aos que "
+"tería o libro impreso. Non obstante, este método é máis lento e ralentiza o "
+"envío de ficheiros ao Kindle"
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:257
 msgid "Communicate with the Kindle DX eBook reader."
@@ -1295,15 +1329,15 @@ msgstr "Comunicar co lector Sony PRS-500"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunicar con todos os lectores de Sony"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Todos por título"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Todos por autor"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1311,7 +1345,7 @@ msgstr ""
 "Lista separada por comas de campos de metadatos para convertelos en "
 "coleccións no dispositivo. As posibilidades son: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1319,15 +1353,15 @@ msgid ""
 msgstr ""
 ". Hai dúas coleccións especiais dispoñibeis: %s:%s e %s:%s. Engada estes "
 "valores á lista para activalas. Ás coleccións asignaráselles o nome "
-"fornecido que vai tras do carácter \":\"."
+"fornecido que vai tras do carácter «:»."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 "Cargar miniaturas de cubertas separadas para libros (nos lectores máis "
 "modernos)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1341,14 +1375,14 @@ msgstr ""
 "pode cambiar a cuberta. ATENCIÓN: Esta opción soamente debería ser usada cos "
 "lectores máis modernos de SONY: 350, 650, 950 e posteriores."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Recargar cubertas separadas ao usar a xestión automática (lectores máis "
 "modernos)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1358,11 +1392,11 @@ msgstr ""
 "vez que conecte o seu dispositivo. Desmarque esta opción se ten moitos "
 "libros no lector cun rendemento inaceptábel."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Preservar as proporcións da portada ao xerar as miniaturas"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1373,6 +1407,20 @@ msgstr ""
 "quere que as miniaturas teñan o tamaño máximo, independentemente da "
 "proporción."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr "Buscar libros en todos os cartafoles"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+"Se se activa esta opción, Calibre buscará libros en todos os cartafoles do "
+"dispositivo e as súas tarxetas. Isto permítelle ao Calibre atopar libros que "
+"se almacenasen no dispositivo con outros programas ou por descarga sen fíos."
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1511,7 +1559,7 @@ msgstr "Personalización adicional"
 msgid "Communicate with an eBook reader."
 msgstr "Comunicar cun lector de eBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Obter información do dispositivo..."
 
@@ -1844,8 +1892,8 @@ msgstr ""
 "liña como mínimo, malia o que indique o documento de entrada. Asignar 0 para "
 "desactivar. De modo predeterminado é 120%. Utiliza esta opción "
 "preferentemente á especificación directa da altura de liña, non sendo que "
-"saiba o que está a facer. Por exemplo, pode conseguir texto con \"dobre "
-"espazo\" asignándolle un valor de 240."
+"saiba o que está a facer. Por exemplo, pode conseguir texto con «dobre "
+"espazo» asignándolle un valor de 240."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:183
 msgid ""
@@ -1997,6 +2045,10 @@ msgid ""
 "margins. Sometimes, this can cause the removal of margins that should not "
 "have been removed. In this case you can disable the removal."
 msgstr ""
+"Algúns documentos especifican as marxes de páxina engadindo marxes á "
+"esquerda e dereita de cada parágrafo, Calibre intentará detectar e eliminar "
+"estas marxes. Ás veces isto pode ocasionar que se eliminen marxes que "
+"deberían manterse. En tal caso, pode desactivar a eliminación."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:320
 msgid ""
@@ -2119,6 +2171,12 @@ msgid ""
 "by Chinese and Japanese for instance) the representation based on the "
 "current calibre interface language will be used."
 msgstr ""
+"Transliterar caracteres unicode á representación ASCII. Teña tino ao emprega "
+"esta opción, xa que substituirá os caracteres unicode con ASCII. Por "
+"exemplo, substituirá «%s» por «Mikhail Gorbachiov». Teña en conta tamén que "
+"nos casos nos que existen múltiples representacións para un carácter "
+"(caracteres compartidos pola escritura china e xaponesa, por exemplo) "
+"empregarase a representación baseada no idioma dla interface do Calibre."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:425
 msgid ""
@@ -2350,7 +2408,7 @@ msgstr "Convertendo a entrada a HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Aplicando transformacións ao libro electrónico..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Creando"
 
@@ -2507,7 +2565,7 @@ msgstr "Iniciar"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Non incluír un Índice ao principio do libro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2517,13 +2575,17 @@ msgid ""
 "\"Table of Contents\" settings (turn on \"Force use of auto-generated Table "
 "of Contents)."
 msgstr ""
-"Especifique cómo se dividirá o libro en seccións. Un valor de \"ningún\" "
+"Especifique como se dividirá o libro en seccións. Un valor de «ningún» "
 "converte o libro nunha única sección. Un valor de \"ficheiros\" converte "
 "cada ficheiro nunha sección; úseo se o seu dispositivo ten problemas co "
-"libro. Un valor de \"Índice de contidos\" converte as entradas do Índice en "
-"títulos e crea seccións; se falla, axuste as configuración de \"Detección de "
-"estrutura\" ou \"Índice\" (active \"Forzar o uso do Índice xerado "
-"automaticamente\")."
+"libro. Un valor de «Índice de contidos» converte as entradas do Índice en "
+"títulos e crea seccións; se falla, axuste as configuración de «Detección de "
+"estrutura» ou «Índice» (active «Forzar o uso do Índice xerado "
+"automaticamente»)."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr "para una lista completa con descricións."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
@@ -2928,105 +2990,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "ERRO DE MODELO"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Non"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Si"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autores/as"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Editor/a"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produtor/a"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Comentarios"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Series"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Idioma"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Marca de tempo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Publicado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Dereitos"
 
@@ -3225,6 +3287,9 @@ msgid ""
 "Downloads series information from ww2.kdl.org. This website cannot handle "
 "large numbers of queries, so the plugin is disabled by default."
 msgstr ""
+"Descargar información de serie de ww2.kdl.org. Este sitio web non admite un "
+"gran número de conexións, así que o complemento está desactivado de maneira "
+"predeterminada."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:25
 msgid "Downloads metadata from Fictionwise"
@@ -3469,13 +3534,13 @@ msgstr "GB"
 msgid "Amazon timed out. Try again later."
 msgstr "O tempo de espera de Amazon expirou. Volva a tentalo máis tarde"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
-msgstr "Fonte de metadatos"
+msgstr "Orixe de metadatos"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/openlibrary.py:15
 msgid "Downloads metadata from The Open Library"
-msgstr ""
+msgstr "Descarga metadatos de The Open Library"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
@@ -3610,7 +3675,7 @@ msgid "HTML TOC generation options."
 msgstr "Opcións da xeración HTM TOC"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3813,6 +3878,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Asunto"
 
@@ -4060,6 +4126,19 @@ msgid ""
 "* off: Don't modify the paragraph structure. This is useful when combined "
 "with Markdown or Textile formatting to ensure no formatting is lost."
 msgstr ""
+"Estrutura de parágrafos.\n"
+"as opcións son [«auto», «block», «single», «print», «unformatted», «off»]\n"
+"* auto: Intenta detectar automaticamente o tipo de parágrafo.\n"
+"* block: Considera cada liña en branco como un salto de parágrafo.\n"
+"* single: Considera cada liña como un parágrafo distinto.\n"
+"* print: Considera que cada liña que comeza con dúa ou máis espazos ou unha "
+"tabulación empeza un parágrafo.\n"
+"* unformatted: Casi todas as liñas teñen saltos forzados, con pouca ou "
+"ningunha sangría. Intenta determinar a estrutura e aplicarlle formato aos "
+"distintos elementos.\n"
+"* off: Non se modifica a estrutura de parágrafos. Esta opción é útil "
+"combinada co formato Markdown ou Textile, para asegurarse de que non se "
+"perde o formato."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:43
 msgid ""
@@ -4073,6 +4152,15 @@ msgid ""
 "* markdown: Processing using markdown formatting. To learn more about "
 "markdown see"
 msgstr ""
+"Formato usado no documento.\n"
+"* auto: Decide automaticamente o procesador de formato que se emprega.\n"
+"* plain: Non procesa o formato do documento. Todo é un parágrafo e non se "
+"lle aplica ningún estilo.\n"
+"* heuristic: Procesa o texto con heurística para determinar formatos como "
+"títulos de capítulo ou cursivas.\n"
+"* textile: Procesa o text con formato textile.\n"
+"* markdown: Procesa o texto con formato markdown. Para aprender máis sobre "
+"markdown véxase"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:53
 msgid ""
@@ -4132,7 +4220,7 @@ msgid ""
 "always removed with plain text output."
 msgstr ""
 "Non eliminar ligazóns no documento. Esta opción só ten utilidade cando se "
-"combina cunha opción de formato de saída do texto diferente de \"ningún\", "
+"combina cunha opción de formato de saída do texto diferente de «ningún», "
 "porque as ligazóns sempre se eliminan na saída de texto simple."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:67
@@ -4143,77 +4231,81 @@ msgid ""
 msgstr ""
 "Non eliminar referencias a imaxes no documento. Esta opción só ten utilidade "
 "cando se combina cunha opción de formato de saída de texto diferente a "
-"\"ningún\", porque as referencias ás imaxes sempre se eliminan na saída de "
+"«ningún», porque as referencias ás imaxes sempre se eliminan na saída de "
 "texto simple."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Enviar o ficheiro á tarxeta de almacenaxe no canto da memoria principal de "
 "modo predeterminado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Confirmar antes de eliminar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Xeometría da xanela principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Notificar se hai versións novas dispoñíbeis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Usar números romanos para as series de números"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Ordenar as listas de etiquetas por nome, popularidade ou puntuación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr "Buscar etiquetas por un término ou por todos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Número de cubertas para amosar no modo de navegación por cubertas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Características xerais para a conversión a LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opcións para o visor de libros electrónicos LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formatos que se están a ver a través do visor interno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Columnas que se amosarán na lista de libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Executar automaticamente o servidor de contido ao arrincar o aplicativo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "As noticias máis antigas manteranse na base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Amosar a icona na área de notificación do sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Enviar as noticias descargadas ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Eliminar libros da biblioteca despois de enviar ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4221,17 +4313,17 @@ msgstr ""
 "Amosar o fluxo de cubertas nunha xanela separada no canto da xanela "
 "principal do Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Desactivar as notificacións da icona da area de notificación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Acción por omisión que se realizará cando se preme o botón enviar ao "
 "dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4239,52 +4331,55 @@ msgstr ""
 "Ir buscando segundo se escribe. Se se desactiva esta opción, a busca só terá "
 "lugar cando se prema na tecla Intro."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
+"Ao buscar, amosar todos os libros, realzando os resultados da busca, en "
+"lugar de amosar só as coincidencias. Pode premer a tecla N ou a tecla F3 "
+"para ir ao seguinte resultado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Número máximo de operacións en espera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Descargar datos sociais (etiquetas, valoración, etc.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Cambiar a autoría e o título polos novos metadatos."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Descargar automaticamente a cuberta, se está dispoñíbel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Limitar o número máximo de tarefas simultáneas ao número de CPU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "O deseño da interface de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 "Amosar a cualificación media por cada elemento no navegador de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Desactivar as animacións IU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "Categorías do navegador de etiquetas que non se mostrarán"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Escoller os ficheiros"
 
@@ -4441,6 +4536,9 @@ msgid ""
 "processed and merged into your Calibre database according to your automerge "
 "settings:"
 msgstr ""
+"Atopáronse os seguintes libros duplicados, e os formatos entrantes "
+"procesáronse e uníronse á base de datos do Calibre segundo a configuración "
+"de unión automática:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:344
 msgid "Failed to read metadata"
@@ -4504,8 +4602,8 @@ msgstr "Usar as anotacións xeradas só dende a biblioteca principal"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Non se seleccionou ningún libro"
@@ -4688,7 +4786,7 @@ msgid ""
 "Metadata will be backed up while calibre is running, at the rate of "
 "approximately 1 book every three seconds."
 msgstr ""
-"Farase unha copia de seguridade dos metadatos mentres calibre está en "
+"Farase unha copia de seguranza dos metadatos mentres calibre está en "
 "execución, a un ritmo aproximado dun libro cada tres segundos."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:306
@@ -4697,7 +4795,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:286
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:340
 msgid "Success"
-msgstr "Éxito."
+msgstr "Correcto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:307
 msgid ""
@@ -4710,7 +4808,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4722,8 +4820,8 @@ msgstr "Produciuse un fallo"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:313
 msgid "Database integrity check failed, click Show details for details."
 msgstr ""
-"A comprobación da integridade da base de datos fallou. Pulse en \"Mostrar "
-"detalles\" para máis información."
+"A comprobación da integridade da base de datos fallou. Pulse en «Mostrar "
+"detalles» para máis información."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:318
 msgid "No problems found"
@@ -4783,7 +4881,7 @@ msgid "Bulk convert"
 msgstr "Converter en grupos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Non é posíbel converter"
 
@@ -4791,7 +4889,7 @@ msgstr "Non é posíbel converter"
 msgid "Starting conversion of %d book(s)"
 msgstr "Iniciando a conversión de %d libros(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "O ficheiro de saída está baleiro, probablemente o proceso de conversión "
@@ -4984,7 +5082,7 @@ msgid "Stop Content Server"
 msgstr "Deter o servidor de contidos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Correo a"
 
@@ -4992,32 +5090,32 @@ msgstr "Correo a"
 msgid "Email to and delete from library"
 msgstr "Mandar por correo electrónico e borrar da biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(borrar da biblioteca)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Actualizar o correo baseado na busca de libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Enviar ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Conectar/compartir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Dentendo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "Detendo o servidor, isto pode levar ata un minuto, agarde..."
@@ -5106,27 +5204,27 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Descargando {0} para {1} libro(s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Non é posíbel editar os metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Non é posíbel unir os libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "Precísase seleccionar, cando menos, dous libros para unilos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 "Vai unir máis de 5 libros. Ten a <b>certeza</b> de que desexa continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5138,7 +5236,7 @@ msgstr ""
 "<br><br> O segundo e subsecuentes libros seleccionados non serán eliminados "
 "nin cambiados. <br> <br>Confirme por favor que quere proceder."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5159,7 +5257,7 @@ msgstr ""
 "seleccionados <b>eliminaranse</b> definitivametne da biblioteca do "
 "Calibre.<br><br>  Seguro <b>sure</b> de que quere proceder?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5178,19 +5276,19 @@ msgstr ""
 "permanentemento da biblioteca do Calibre.<br><br>  Esta <b>seguro</b> de que "
 "quere proceder?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Obter novas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Obtendo novas de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " obtidas."
 
@@ -5255,7 +5353,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl + P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Lanzar o asistente de benvida"
 
@@ -5506,7 +5604,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:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Sen libros"
 
@@ -5727,8 +5825,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Ruta"
 
@@ -5738,17 +5836,17 @@ msgstr "Ruta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Coleccións"
 
@@ -5758,25 +5856,25 @@ msgid "Click to open"
 msgstr "Prema para abrir"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Ningún"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Pegar cuberta"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Copiar cuberta"
 
@@ -5834,7 +5932,7 @@ msgstr "saída"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5857,14 +5955,14 @@ msgstr "saída"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6458,10 +6556,14 @@ msgstr "Non inserir un Ín&dice ao comezo do libro."
 msgid "FB2 Output"
 msgstr "Saída FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Dividir en seccións:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr "Xénero"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Asistente de redimensionamento do tipo de letra"
@@ -6598,7 +6700,7 @@ msgstr "&Factor de unión de liñas:"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:118
 msgid "Detect and markup unformatted chapter headings and sub headings"
 msgstr ""
-"Detectar e marcar cabeceiras e subcabeceiras de capítules sen formato"
+"Detectar e marcar cabeceiras e subcabeceiras de capítulos sen formato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:119
 msgid "Renumber sequences of <h1> or <h2> tags to prevent splitting"
@@ -7093,7 +7195,7 @@ msgid "Regex:"
 msgstr "Expresión regular:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Proba"
 
@@ -7288,7 +7390,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove &fake margins"
-msgstr ""
+msgstr "Eliminar marxes &falsas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
@@ -7364,7 +7466,7 @@ msgstr "Eliminar o sangrado no principio da liña."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:98
 msgid "Markdown"
-msgstr ""
+msgstr "Linguaxe Markdown"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:99
 msgid ""
@@ -7591,7 +7693,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:520
 msgid "Apply changes"
-msgstr "Aplicar os trocos"
+msgstr "Aplicar os cambios"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:713
 msgid "Remove series"
@@ -7713,21 +7815,21 @@ msgstr "Erro"
 msgid "Error communicating with device"
 msgstr "Produciuse un erro ao comunicar co dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Non hai formatos axeitados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Escoller o cartafol para abrir como dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Produciuse un erro ao conectar co dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7735,68 +7837,68 @@ msgstr ""
 "Produciuse un erro temporal na comunicación co dispositivo. Desconecte e "
 "volva conectar o dispositovo e/ou reinícieo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "seleccionado para enviar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i de %i libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 de %i libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Elixa formato para enviar ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Sen dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Non se pode enviar: non hai ningún dispositivo conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Sen tarxeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Non se pode enviar: o dispositivo non ten tarxeta de memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Desexa converter os libros seguintes antes de os enviar ao dispositivo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Enviando catálogos ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Enviando novas ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Enviando libros ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7805,11 +7907,11 @@ msgstr ""
 "atoparon formatos compatíbeis. Converta o ou os libros a un formato "
 "compatíbel co dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Non hai espazo no dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7826,6 +7928,9 @@ msgid ""
 "support them. If you send these formats to your {1} they may not work. Are "
 "you sure?"
 msgstr ""
+"Activáronse os formatos <b>{0}</b> para o seu {1}. Pode que o {1} non os "
+"admita. Se envia estes formatos ao {1} é posíbel que non funcionen. Está "
+"seguro?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:402
@@ -7955,7 +8060,7 @@ msgstr "Comprobando a integridade da base de datos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:55
 msgid "Dumping database to SQL"
-msgstr "Volcando base de datos a SQL"
+msgstr "Envorcando a base de datos a SQL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:81
 msgid "Loading database from SQL"
@@ -8046,6 +8151,59 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"        <h1>Axuda</h1>\n"
+"<p>Calibre almacena a lista de libros e os seus metadatos nunha base de "
+"datos. Os ficheiros dos libros e as cubertas gárdanse como ficheiros normais "
+"no cartafol da biblioteca do Calibre. A base de datos contén unha lista dos "
+"ficheiros e cubertas correspondentes a cada libro. Esta utilidade comproba "
+"que os ficheiros realmente presentes no cartafol da biblioteca do seu "
+"computador se correspondan coa información da base de datos.</p>\n"
+"<p>O resultado de cada comprobación amósase á esquerda. As distintas "
+"comprobacións son:</p>\n"
+"<ul>\n"
+"<li><b>Títulos incorrectos</b>: Son ficheiros e cartafoles que están na "
+"biblioteca, onde se atopan os libros, pero que non teñen a forma correcta "
+"para ser un título de libro.</li>\n"
+"<li><b>Títulos adicionais</b>: Son ficheiros adicionais na biblioteca do "
+"Calibre que parecen títulos correctos, pero que non teñen unha entrada "
+"correspondente na base de datos.</li>\n"
+"<li><b>Autores incorrectos</b>: Son ficheiros que están na biblioteca, onde "
+"só deberían estar os cartafoles dos autores.</li>\n"
+"<li><b>Autores adicionais</b>: Son cartafoles na biblioteca do Calibre que "
+"parecen autores, pero que non teñen entrada na base de datos.</li>\n"
+"<li><b>Formatos de libro inexistentes</b>: Son formatos de libro que "
+"aparecen na base de datos, pero que non teñen o seu correspondente ficheiro "
+"no cartafol do libro.</li>\n"
+"<li><b>Formatos de libro adicionais</b>: Son ficheiros de libro que están no "
+"cartafol do libro pero non na base de datos.</li>\n"
+"<li><b>Ficheiros descoñecidos</b>: Son ficheiros adicionais no cartafol do "
+"libro que non corresponden a ningún formato coñecido nin á portada.</li>\n"
+"<li><b>Portadas inexistentes</b>: Son libros que na base de datos teñen unha "
+"portada asignada, pero cuxo ficheiro da portada non existe realmente.</li>\n"
+"<li><b>Portadas que non están na base de datos</b>: Son libros que teñen os "
+"seus ficheiros de cubertas, pero que non teñen ningunha cuberta asignada na "
+"base de datos.</li>\n"
+"<li><b>Cartafol que dá erro</b>: Son cartafoles na biblioteca do Calibre que "
+"esta utilidade non puido procesar ou interpretar.</li>\n"
+"</ul>\n"
+"<p>Hai dous tipos de corrección automática posíbel: <i>Borrar marcados</i> e "
+"<i>Reparar marcados</i>.</p>\n"
+"<p><i>Borrar marcados</i> úsase para eliminar os ficheiros, cartafoles ou "
+"cubertas adicionais que non teñen entrada na base de datos. Marque a caixa "
+"que está xunta o elemento que desexe borrar. Utilíceo con precaución.</p>\n"
+"<p><i>Reparar marcados</i> aplícase só ás portadas e aos formatos "
+"inexistentes (as tres liñas marcadas con «reparábel»). No caso de portadas "
+"inexistentes, ao marcar a caixa de «reparábel» e premer este botón "
+"eliminarase a asignación de cuberta da base de datos para todos os ficheiros "
+"desa categoría. Use esta opción se non vai recuperar as cubertas dunha copia "
+"de seguranza. No caso de cubertas adicionais, ao marcar a casa de "
+"«reparábel» e premer este botón asignarase a cuberta a todos os ficheiros "
+"desta categoría. Use esta opción cando non vaia a borrar os ficheiros. No "
+"caso de formatos inexistentes, ao marcar a caixa de «reparábel» e premer "
+"este botón eliminarase a información destes formatos. Use esta opción se non "
+"vai recuperar os formatos dunha copia de seguranza.</p>\n"
+"\n"
+"        "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:226
 msgid "&Run the check again"
@@ -8115,7 +8273,7 @@ msgstr "Elixir formato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formato"
 
@@ -8125,7 +8283,7 @@ msgstr "Existente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:51
 msgid "Convertible"
-msgstr "Convertible"
+msgstr "Convertíbel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:43
 msgid "Choose location for calibre library"
@@ -8224,6 +8382,8 @@ msgid ""
 "You can also customise the plugin locations using <b>Preferences -> "
 "Customise the toolbar</b>"
 msgstr ""
+"Tamén pode personalizar as localizacións de complementos en <b>Preferencias -"
+"> Personalizar a barra de ferramentas</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
@@ -8256,7 +8416,7 @@ msgstr "&Aceptar"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Cancelar"
 
@@ -8305,8 +8465,8 @@ msgid "Location"
 msgstr "Localización"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8332,18 +8492,23 @@ msgid ""
 "          available at <a href=\"http://drmfree.calibre-ebook.com\">Open "
 "Books</a>."
 msgstr ""
+"<p>Este libro está bloqueado con <b>DRM</b>. Para saber máis sobre DRM e por "
+"qué non pode ler o converter este libro co Calibre, <a "
+"href=\"http://drmfree.calibre-ebook.com/about#drm\">prema aquí</a>.\n"
+"<p>Pode atopar novidades sen DRM en <a href=\"http://drmfree.calibre-"
+"ebook.com\">Open Books</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:35
 msgid "Author sort"
 msgstr "Ordenar por autoría"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Nombre de autor incorrecto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Os nomes de autores non poden conter caracteres «&»."
 
@@ -8365,6 +8530,9 @@ msgid ""
 "generated from the author. Exactly how this value is automatically\n"
 "generated can be controlled via Preferences->Advanced->Tweaks"
 msgstr ""
+"Restabelecer todos os valores de ordenación por autor ao valor xerado\n"
+"automaticamente a partir do autor. Pode controlarse a maneira precisa en\n"
+"que este valor se xera en Preferencias->Avanzado->Axustes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:80
 msgid "Recalculate all author sort values"
@@ -8375,6 +8543,9 @@ msgid ""
 "Copy author sort to author for every author. You typically use this button\n"
 "after changing Preferences->Advanced->Tweaks->Author sort name algorithm"
 msgstr ""
+"Copiar a ordenación de autor no autor para cadanseu autor.\n"
+"Normalmente, emprégase este botón tras o cambio de\n"
+"Preferencias->Avanzada->Axustes->Algoritmo de ordenación de autor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:83
 msgid "Copy all author sort values to author"
@@ -8537,22 +8708,22 @@ msgid "Working"
 msgstr "Traballando"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Minúsculas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Maiúsculas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Formato de título (todas as iniciais en maiúscula)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Pór en maiúsculas"
 
@@ -8698,11 +8869,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:988
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:587
 msgid "Delete saved search/replace"
-msgstr "Borrar a busca/substitución gardada"
+msgstr "Eliminar a busca/substitución gardada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:989
 msgid "The selected saved search/replace will be deleted. Are you sure?"
-msgstr "A busca/substitución gardada seleccionada se borrará. Está seguro?"
+msgstr ""
+"A busca/substitución gardada seleccionada vai ser eliminada. Está seguro?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:1006
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:1014
@@ -8718,7 +8890,7 @@ msgid ""
 "That saved search/replace already exists and will be overwritten. Are you "
 "sure?"
 msgstr ""
-"Esa busca/substitución gardada xa existe e será sobrescrita. Desexa "
+"Esa busca/substitución gardada xa existe e vai ser sobrescrita. Desexa "
 "continuar?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:524
@@ -8802,7 +8974,7 @@ msgstr "Se está marcado, as series serán desbotadas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:548
 msgid "&Clear series"
-msgstr "&Borrar a serie"
+msgstr "&Limpar a serie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:549
 msgid ""
@@ -8833,7 +9005,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:557
 msgid "&Force numbers to start with:"
-msgstr "&Obrigar a que los números comecen por:"
+msgstr "&Forzar que os números comecen por:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:558
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:440
@@ -8857,7 +9029,7 @@ msgstr "&Publicado:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:564
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:444
 msgid "Clear published date"
-msgstr "Borrar a data de publicación"
+msgstr "Limpar a data de publicación"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:567
 msgid "Remove &format:"
@@ -8936,7 +9108,7 @@ msgstr "Metadatos &personalizados"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:583
 msgid "Load searc&h/replace:"
-msgstr "Cargar &busca/substitución:"
+msgstr "Cargar a &busca/substitución:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:584
 msgid "Select saved search/replace to load."
@@ -9572,8 +9744,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:102
 msgid "Restoring database failed, click Show details to see details"
 msgstr ""
-"A restauración da base de datos fallou. Pulse \"Mostrar detalles\" para máis "
-"información"
+"A restauración da base de datos fallou. Prema «Mostrar detalles» para obter "
+"máis información"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:107
 msgid ""
@@ -9581,7 +9753,7 @@ msgid ""
 "see the details."
 msgstr ""
 "A restauración da base de datos rematou satisfactoriamente, con algúns "
-"avisos. Pulse \"Mostrar detalles\" para máis información"
+"avisos. Prema «Mostrar detalles» para máis información"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:112
 msgid "Restoring database was successful"
@@ -9590,12 +9762,14 @@ msgstr "A restauración da base de datos rematou satisfactoriamente"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:75
 msgid "Saved search already exists"
-msgstr ""
+msgstr "A busca gardada xa existe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:76
 msgid "The saved search %s already exists, perhaps with different case"
 msgstr ""
+"A busca gardada %s xa existe, quizais con diferente combinación de "
+"maiúsculas e minúsculas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:62
 msgid ""
@@ -9629,7 +9803,7 @@ msgstr "Engadir a nova busca gardada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:102
 msgid "Rename the current search to what is in the box"
-msgstr ""
+msgstr "Cambiar o nome da busca actual ao que aparece no cadro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:104
 msgid "Change the contents of the saved search"
@@ -9646,6 +9820,12 @@ msgid ""
 "                soon after 9:00 AM as possible.\n"
 "            "
 msgstr ""
+"                Descargar esta publicación todas as semanas, nos días "
+"especificados,\n"
+"tras a hora especificada. Por exemplo, se escolle «Luns despois\n"
+"das 9:00 AM», a publicación descargarase todos os luns, tan pronto\n"
+"como sexa posíbel, pero sempre despois das 9:00 AM.\n"
+"            "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:61
 msgid "&Download after:"
@@ -9663,6 +9843,13 @@ msgid ""
 "                month, as soon after 9:00 AM as possible.\n"
 "            "
 msgstr ""
+"                Descargar esta publicación todos os meses, nos días "
+"especificados.\n"
+"A descarga terá lugar tan pronto como sexa posíbel, pero sempre\n"
+"despois da hora especificada. Por exemplo, se escolle os días 1 e 15\n"
+"despois das 9:00 AM, a publicación descargarase os días 1 e 15 de\n"
+"cada mes, despois das 9:00 AM.\n"
+"            "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:103
 msgid "&Days of the month:"
@@ -9670,7 +9857,7 @@ msgstr "&Días do mes:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:105
 msgid "Comma separated list of days of the month. For example: 1, 15"
-msgstr ""
+msgstr "Lista de días do mes, separados por comas. Por exemplo: 1, 15"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:109
 msgid "Download &after:"
@@ -9685,6 +9872,12 @@ msgid ""
 "                0.1 days to download a periodical more than once a day.\n"
 "            "
 msgstr ""
+"                Descargar esta publicación cada x días. Por exemplo, se "
+"escolle 30 días,\n"
+"a publicación descargarase cada 30 días. É posíbel especificar intervalos\n"
+"menores dun día, como 0.1 días, para descargar unha publicación varias\n"
+"veces ao día.\n"
+"            "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:151
 msgid "&Download every:"
@@ -9702,10 +9895,12 @@ msgstr "días"
 msgid ""
 "Note: You can set intervals of less than a day, by typing the value manually."
 msgstr ""
+"Nota: Pode especificar intervalos menores dun día, tecleando o valor "
+"manualmente."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:196
 msgid "%s news sources"
-msgstr ""
+msgstr "%s Fontes de novas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Need username and password"
@@ -9822,10 +10017,12 @@ msgid ""
 "Maximum number of copies (issues) of this recipe to keep.  Set to 0 to keep "
 "all (disable)."
 msgstr ""
+"Máximo número de copias (exemplares) desta receita que desexa manter. "
+"Estabeleza o valor 0 para mantenlos todos (desactivado)."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 msgid "&Keep at most:"
-msgstr ""
+msgstr "&Conservar cando moito:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid ""
@@ -9837,6 +10034,14 @@ msgid ""
 "<p>Also, the setting for deleting periodicals older than a number of days, "
 "below, takes priority over this setting."
 msgstr ""
+"<p>Cando se activa, esta opción fai que o Calibre manteña, cando moito, o "
+"número especificado de exemplares desta publicación. Cada vez que se "
+"descarga un novo exemplar, bórrase o máis antigo se o número total es maior "
+"ca este número.\n"
+"<p>Teña en conta que esta función só ten efecto se marcou a opción de "
+"engadirlle  o título como etiqueta.\n"
+"<p>Ademais, a opción para borrar publicacións con certa antigüidade ten "
+"prioridade sobre esta función."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "all issues"
@@ -9856,7 +10061,7 @@ msgstr "&Descargar agora"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:221
 msgid "&Delete downloaded news older than:"
-msgstr ""
+msgstr "&Eliminar as novas descargadas máis antigas que:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:222
 msgid ""
@@ -9866,10 +10071,14 @@ msgid ""
 "periodical that are kept by clicking the Advanced tab for that periodical "
 "above."
 msgstr ""
+"<p>Borrar as novas descargadas cunha antigüidade maior que o número de días "
+"especificado. Estabelézao en 0 para desactivar a función.\n"
+"<p>Tamén pode controlar o máximo número de exemplares duna mesma publicación "
+"que desexa manter, premendo na lapela «Avanzada» para a publicación."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:224
 msgid "never delete"
-msgstr ""
+msgstr "Non eliminar nunca"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:225
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
@@ -9878,7 +10087,7 @@ msgstr " días"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:226
 msgid "Download all scheduled news sources at once"
-msgstr ""
+msgstr "Descargar todas as fontes de novas programadas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:227
 msgid "Download &all scheduled"
@@ -10027,7 +10236,7 @@ msgstr " (non en calquera libro)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:146
 msgid "Category lookup name: "
-msgstr ""
+msgstr "Nome de busca da categoría: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:191
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:222
@@ -10040,6 +10249,8 @@ msgid ""
 "That name contains leading or trailing periods, multiple periods in a row or "
 "spaces before or after periods."
 msgstr ""
+"O nome contén puntos ao principio ou ao final, varios puntos seguidos ou "
+"espazos antes ou despois de puntos."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:200
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:230
@@ -10173,12 +10384,12 @@ msgid "%s (was %s)"
 msgstr "%s (era %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "O elemento está en branco"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "Un elemento non se pode deixar en branco. Elimíneo  no seu canto."
 
@@ -10249,7 +10460,7 @@ msgid "Send test mail from %s to:"
 msgstr "Enviar un correo de proba de %s a :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Proba"
 
@@ -10398,7 +10609,7 @@ msgstr "&Compartir receita"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "S&how recipe files"
-msgstr ""
+msgstr "A&mosar os ficheiros de receita"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263
 msgid "Customize &builtin recipe"
@@ -10504,67 +10715,67 @@ msgstr "Produciuse un fallo na descarga"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dnd.py:85
 msgid "Failed to download from %r with error: %s"
-msgstr ""
+msgstr "Fallou a descarga de %r co erro: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Enviar por correo %s a %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Novas:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Anéxase o ficheiro periódico %s descargado por Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "Libro electrónico:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "O libro electrónico está anexo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "no formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Enviando correo a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Desexa converter automaticamente os seguintes libros antes de os enviar por "
 "correo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Non se puideron enviar por correo os libros seguintes xa que non se atopou o "
 "formato correcto."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Fallou ao enviar por correo o libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "enviado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Enviar novas a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10588,67 +10799,85 @@ msgstr ""
 "grupo para as distintas entradas de metadatos están documentados nas "
 "axudas.</p></div>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "&Expresión regular"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Nome de ficheiro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Título:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Expresión regular (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Non hai coincidencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autoría:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Expresión regular (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Series:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Expresión regular (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Índice de series:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Expresión regular (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Expresión regular (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr "Editor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr "Expresión regular (?P<publisher>)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr "Publicado:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr "Expresión regular (?P<published>)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Navegador de cubertas"
@@ -10839,7 +11068,7 @@ msgstr "Restabelecer a busca rápida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:203
 msgid "Change the way searching for books works"
-msgstr ""
+msgstr "Modificar a forma na que se realizan as buscas de libros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:215
 msgid "Copy current search text (instead of search name)"
@@ -10861,48 +11090,48 @@ msgstr "S"
 msgid "Edit template"
 msgstr "Editar o modelo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "No dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Tamaño (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Libro %s de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "O nome de busca é «{0}»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "O UUID deste libro é «{0}»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "Na biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Tamaño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Marcado para eliminar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Prema dúas veces para <b>editar</b><br><br>"
 
@@ -10979,7 +11208,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Sen coincidencias</b> para a frase de busca <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Non se atopou ningunha coincidencia"
 
@@ -10996,12 +11225,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Barra de ferramentas do visor de LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Páxina seguinte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Páxina anterior"
 
@@ -11309,15 +11538,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding.py:28
 msgid "Ignore duplicate incoming formats"
-msgstr ""
+msgstr "Ignorar os ficheiros entrantes duplicados"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding.py:29
 msgid "Overwrite existing duplicate formats"
-msgstr ""
+msgstr "Sobreescribir os ficheiros existentes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding.py:30
 msgid "Create new record for each duplicate format"
-msgstr ""
+msgstr "Crear un rexistro novo para cada ficheiro duplicado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:65
 msgid ""
@@ -11357,10 +11586,21 @@ msgid ""
 "Title match ignores leading indefinite articles (\"the\", \"a\", \"an\"), "
 "punctuation, case, etc. Author match is exact."
 msgstr ""
+"Fusión automática: Se se encontran libros con títulos e autores iguais, "
+"fusionar os formatos entrantes automaticamente cos rexistros de libros "
+"existentes. O cadro da dereita controla o que ocorre cando un rexistro "
+"existente xa contén o formato entrante. Teña en conta que esta opción tamén "
+"lle afecta á acción «Copiar na biblioteca».\n"
+"\n"
+"A comparación de títulos omite artigos iniciais («the», «a», «an»), "
+"puntuación, maiúsculas, etc. A comparación\n"
+"de autores é exacta."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:74
 msgid "&Automerge added books if they already exist in the calibre library:"
 msgstr ""
+"F&usionar automaticamente os libros engadidos se xa existen na biblioteca do "
+"Calibre:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:75
 msgid ""
@@ -11381,6 +11621,21 @@ msgid ""
 "punctuation, case, etc.\n"
 "Author matching is exact."
 msgstr ""
+"Fusión automática: Se se encontran libros con títulos e autores iguais, unir "
+"os formatos entrantes automaticamente\n"
+"cos rexistros de libros existentes. Este cadro da dereita controla o que "
+"ocorre cando un rexistro existente\n"
+"xa contén o formato entrante:\n"
+"\n"
+"Ignorar os ficheiros entrantes duplicados - significa que os ficheiros que "
+"xa existan na biblioteca do Calibre no se substituirán\n"
+"Sobreescribir os ficheiros existentes - significa que os que ficheiros que "
+"xa existan na biblioteca do Calibre se substituirán\n"
+"Crear un novo rexistro para cada ficheiro duplicado - significa que se "
+"creará unha nova entrada para cada ficheiro duplicado\n"
+"\n"
+"A comparación de títulos omite os artigos iniciais («the», «a», «an»), "
+"puntuación, maiúsculas, etc. A comparación de autores é exacta."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:85
 msgid "&Tags to apply when adding a book:"
@@ -11411,7 +11666,7 @@ msgstr "Alto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:36
 msgid "Very low"
-msgstr ""
+msgstr "Moi baixa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:164
 msgid "Confirmation dialogs have all been reset"
@@ -11517,7 +11772,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:88
 msgid "Move column up"
-msgstr ""
+msgstr "Subir a columna"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:90
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:84
@@ -11536,7 +11791,7 @@ msgstr "Editar as configuracións dunha columna definida polo usuario"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:96
 msgid "Move column down"
-msgstr ""
+msgstr "Baixar a columna"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:91
@@ -11600,20 +11855,20 @@ msgstr "Columna construída a partir doutras columnas"
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:51
 msgid "Create a custom column"
-msgstr ""
+msgstr "Crear una columna personalizada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:62
 msgid "Quick create:"
-msgstr ""
+msgstr "Creación rápida:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:149
 msgid "Modified Date"
-msgstr ""
+msgstr "Data de modificación"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 msgid "People's names"
-msgstr ""
+msgstr "Nomes de persoas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 msgid "Number"
@@ -11626,7 +11881,7 @@ msgstr "Texto"
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:87
 msgid "Edit a custom column"
-msgstr ""
+msgstr "Modificar unha columna personalizada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:91
 msgid "No column selected"
@@ -11642,19 +11897,19 @@ msgstr "A columna que escolleu non é unha columna definida polo usuario"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:146
 msgid "My Tags"
-msgstr ""
+msgstr "As miñas etiquetas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:147
 msgid "My Series"
-msgstr ""
+msgstr "As miñas series"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:148
 msgid "My Rating"
-msgstr ""
+msgstr "A miña puntuación"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:150
 msgid "People"
-msgstr ""
+msgstr "Persoas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:179
 msgid "No lookup name was provided"
@@ -11731,7 +11986,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:194
 msgid "&Column type"
-msgstr ""
+msgstr "Tipo de &columna"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:195
 msgid "What kind of information will be kept in the column."
@@ -11744,19 +11999,23 @@ msgid ""
 "a red X.\n"
 "Everything else will show nothing."
 msgstr ""
+"As marcas de comprobación na interface gráfica. Os valores «yes», «checked» "
+"e «true» amósanse cunha marca verde. Os valores «no», «unchecked» e «false»  "
+"amósanse cunha cruz vermella. Con calquera outro valor non se amosa nada."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:199
 msgid "Show checkmarks"
-msgstr ""
+msgstr "Mostrar marcas de comprobación"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:200
 msgid ""
 "Check this box if this column contains names, like the authors column."
 msgstr ""
+"Marque esta caixa se a columna contén nomes, como a columna de autores."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:201
 msgid "Contains names"
-msgstr ""
+msgstr "Contén nomes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:202
 msgid ""
@@ -11807,19 +12066,21 @@ msgstr "Valor predeterminado: (nada)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:215
 msgid "&Sort/search column by"
-msgstr ""
+msgstr "&Buscar/ordenar columna por"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:216
 msgid "How this column should handled in the GUI when sorting and searching"
-msgstr ""
+msgstr "Como se debe manexar esta columna na interface ao ordenar ou buscar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:217
 msgid "If checked, this column will appear in the tags browser as a category"
 msgstr ""
+"Se se marca, esta columna aparecerá no explorador de etiquetas coma unha "
+"categoría"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:218
 msgid "Show in tags browser"
-msgstr ""
+msgstr "Amosar no explorador de etiquetas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:219
 msgid "Values"
@@ -11877,20 +12138,30 @@ msgstr "Facer &predeterminado"
 msgid "&Remove email"
 msgstr "&Retirar correo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Enviar automaticamente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Correo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 "Formatos para o correo. O primeiro formato que coincida será o enviado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+"Asunto da mensaxe que se usará ao enviar. Se se deixa en branco, o asunto "
+"será o título. Ademais, os mesmos modelos que se usan para «Gardar no "
+"disco», como {title} e {author_sort}, poden usarse aquí."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11898,7 +12169,7 @@ msgstr ""
 "Se estiver marcado, as novas descargadas enviaranse automaticamente <br> a "
 "este enderezo de correo (sempre que estiveren nun dos formatos relacionados)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "novo enderezo de correo"
 
@@ -11910,95 +12181,95 @@ msgstr "Estreito"
 msgid "Wide"
 msgstr "Largo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Medio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Pequeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Sempre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automático"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nunca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Pola primeira letra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Particionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Disposición da interface de usuario (precisa reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Número de cuberta para amosar no modo de navegación  (precisa reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Elixa o &idioma (require reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Amosar as &puntuacións no navegador de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Desactivar todas as animacións, unha opción útil se tivermos un computador "
 "antigo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Desactivar as &animacións"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Activar a icona da bandexa do sis&tema (precisa reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Amosar a &pantalla de benvida ao comezar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Desactivar &notificacións na bandexa do sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Usar números &romanos para as series"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Amosar a &navegación por cuberta nunha xanela separada (precisa reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
-msgstr ""
+msgstr "Método de &división de categorías no navegador de etiquetas:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -12012,11 +12283,11 @@ msgstr ""
 "ter unha lista de grupos de tamaño fixo. Escolla desactivado\n"
 "se non vai querer nunca subcategorías"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
-msgstr ""
+msgstr "&Contraer cando o número de elementos sexa maior ca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -12027,11 +12298,11 @@ msgstr ""
 "en subcategorías. Se o método de partición se pon como desactivado, "
 "ignorarase este valor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
-msgstr ""
+msgstr "Categorías con elementos &xerárquicos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -12040,53 +12311,55 @@ msgid ""
 "both under 'Mystery'. If 'tags' is not in this box,\n"
 "then the tags will be displayed each on their own line."
 msgstr ""
+"Unha lista de columnas, separadas por comas, nas que os elementos\n"
+"con puntos se amosarán na árbore do explorador de etiquetas. Por exemplo,\n"
+"se este cadro contén «tags», daquela as etiquetas «Misterio.Galego» e\n"
+"«Misterio.Crime» amosaranse con «Galego» e «Crime» como\n"
+"subcategorías de «Misterio». Se o cadro non contén «tags», daquela as\n"
+"etiquetas amosaranse cada unha pola súa conta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "Barra de &ferramentas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Tamaño da &icona:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Amosar &texto debaixo das iconas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Dividir a barra de ferramentas en dous"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Tipo de letra da interface:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Cambiar o &tipo de letra (require o reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Aplicar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Restaurar opcións &predeterminadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Gardar os cambios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Cancelar e volver á panorámica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "A restauración das opcións predeterminadas non está admitida para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -12094,7 +12367,7 @@ msgstr ""
 "Algúns cambios requiren que reinicie. Por favor, reinicie o Calibre canto "
 "antes."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -12103,7 +12376,7 @@ msgstr ""
 "poderá realizar ningún outro axuste nin podrá escoller as súas preferencias "
 "ata que a operación de reinicio conclúa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Requírese reiniciar"
@@ -12482,6 +12755,32 @@ msgid ""
 "check for duplicates, to find which column contains a particular item, or to "
 "have hierarchical categories (categories that contain categories)."
 msgstr ""
+"Os <b>termos agrupados de busca</b> son nomes de busca que permiten "
+"consultar automaticamente en máis dunha columna. Por exemplo, créase un "
+"termo agrupado de busca <code>todasasseries</code> co valor <code>series, "
+"#asmiñasseries, #asmiñasseries</code>, entón a busca "
+"<code>todasasseries:adhoc</code> buscará «adhoc» en calquera das columnas "
+"<code>series</code>, <code>#asmiñasseries</code> e "
+"<code>#asmiñasseries2</code>.\r\n"
+"<p>Introduza o nome do termo agrupado de busca no cadro despregábel, "
+"introduza a lista de columnas nas que buscar no cadro de valor, logo prema o "
+"botón «Gardar».\r\n"
+"<p>Nota: Os nomes pásanse sempre a minúsculas: <code>AMiñaBusca</code> e "
+"<code>amiñabusca</code> son equivalentes.\r\n"
+"<p>Pode facer que un termo agrupado de busca se amose como categoría de "
+"usuario no explorador de etiquetas. Simplemente engada o termo agrupado de "
+"busca no cadro «Crear categorías de usuario a partir de». Pode engadir "
+"varios termos separados por comas. As novas categorías de usuario contarán "
+"automaticamente con todos os elementos nas categorías incluídas nos termos "
+"agrupados de busca.\r\n"
+"<p>As categorías de usuario automáticas permítenlle ver facilmente todos os "
+"elementos que están nas columnas contidas no termo agrupado de busca. Usando "
+"o exemplo anterior de <code>todoseries</code>, a categoría de usuario xerada "
+"automaticamente conterá todas as series que aparezan en <code>series</code>, "
+"<code>#miserie</code> e <code>#miserie2</code>. Isto pode resultar útil para "
+"comprobar duplicados, atopar que columna contén un elemento en particular ou "
+"para establecer unha xerarquía de categorías (categorías que conteñen outras "
+"categorías)."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:96
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:106
@@ -12490,40 +12789,43 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:119
 msgid "Grouped Search Terms"
-msgstr ""
+msgstr "Termos de busca agrupados"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:97
 msgid "The search term cannot be blank"
-msgstr ""
+msgstr "O termo de busca non pode quedar en branco"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:107
 msgid "That name is already used for a column or grouped search term"
 msgstr ""
+"Ese nome xa se está a usar para unha columna ou termo de busca agrupado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:111
 msgid "That name is already used for user category"
-msgstr ""
+msgstr "Ese nome xa se está a usar para a categoría usuario"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:117
 msgid "The value box cannot be empty"
-msgstr ""
+msgstr "A caixa de valor non pode quedar baleira"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:129
 msgid "The empty grouped search term cannot be deleted"
-msgstr ""
+msgstr "O termo de busca agrupado non se pode eliminar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:110
 msgid "Search as you &type"
-msgstr ""
+msgstr "Buscar conforme se &teclea"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:111
 msgid ""
 "&Highlight search results instead of restricting the book list to the results"
 msgstr ""
+"&Realzar os resultados da busca en lugar de limitar a lista de libros aos "
+"resultados"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:112
 msgid "What to search by default"
-msgstr ""
+msgstr "Que buscar de modo predeterminado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:113
 msgid ""
@@ -12532,14 +12834,19 @@ msgid ""
 "search not just authors but title/tags/series/comments/etc. Use these "
 "options if you would like to change this behavior."
 msgstr ""
+"Cando realiza unha busca sen prefixo, de maneira predeterminada Calibre "
+"buscará todos os metadatos para encontrar coincidencias. Por exemplo, se "
+"introduce «asimov» buscarase non só nos autores senón tamén en títulos, "
+"etiquetas, series, comentarios, etc. Use estas opcións se desexa cambiar "
+"este comportamento."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:114
 msgid "&Limit the searched metadata"
-msgstr ""
+msgstr "&Limitar a busca de metadatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:115
 msgid "&Columns that non-prefixed searches are limited to:"
-msgstr ""
+msgstr "&Columnas á que se limitan as buscas sen prefixo:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:116
 msgid ""
@@ -12548,20 +12855,26 @@ msgid ""
 "you always use prefixes in your saved searches. For example, use "
 "\"series:Foundation\" rather than just \"Foundation\" in  a saved search"
 msgstr ""
+"Teña en conta que esta opción afecta a todas as buscas, incluídas as buscas "
+"gardadas e as restricións. Daquela, se se emprega esta opción, é mellor "
+"asegurarse de que todas as buscas gardadas teñan prefixos. Por exemplo, use "
+"«series:Fundación» en lugar de simplemente «Fundación» nunha busca gardada."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:117
 msgid ""
 "Clear search histories from all over calibre. Including the book list, e-"
 "book viewer, fetch news dialog, etc."
 msgstr ""
+"Limpar os historiais de busca de todo o Calibre. Inclúe a lista de libros, o "
+"visor de libros, o diálogo de adquisición de novas, etc."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:118
 msgid "Clear search &histories"
-msgstr ""
+msgstr "Despexa &historiais de busca"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:120
 msgid "&Names:"
-msgstr ""
+msgstr "&Nomes:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:121
 msgid ""
@@ -12571,10 +12884,15 @@ msgid ""
 "changing the name and pressing Save. Change the value of\n"
 "a search term by changing the value box then pressing Save."
 msgstr ""
+"Contén os nomes dos termos agrupados de busca definidos actualmente.\n"
+"Para crear un nono nome introdúzao no cadro baleiro e prema «Gardar» "
+"despois.\n"
+"Para cambiar o nome dun termo seleccióneo, cambie o nome e prema «Gardar».\n"
+"Para cambiar o valor dun termo modifique o cadro de valor e prema «Gardar»."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:126
 msgid "Delete the current search term"
-msgstr ""
+msgstr "Borrar o termo de busca actual"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:128
 msgid ""
@@ -12582,20 +12900,25 @@ msgid ""
 "changing the name then pressing Save. You can change the value\n"
 "of a search term by changing the value box then pressing Save."
 msgstr ""
+"Gardar o termo de busca actual. Pode cambiar o nome dun\n"
+"termo de busca modificando o nome e premendo «Gardar». Pode\n"
+"cambiar o valor modificando o valor e logo premendo «Gardar»."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:131
 msgid "&Save"
-msgstr ""
+msgstr "&Gardar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:132
 msgid "Make &user categories from:"
-msgstr ""
+msgstr "Crear categorías de &usuario a partir de:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:133
 msgid ""
 "Enter the names of any grouped search terms you wish\n"
 "to be shown as user categories"
 msgstr ""
+"Introduza os nomes dos termos agrupados de busca\n"
+"que quere amosar como categorías de usuario"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:70
@@ -12844,7 +13167,7 @@ msgstr ""
 "        <p><code>evaluate(self, formatter, kwargs, mi, locals, "
 "os_seus_parámetros)\n"
 "        &rarr; devolve unha cadea de texto unicode</code></p>\n"
-"        <p>Os parámetros da función \"evaluate\" son:\n"
+"        <p>Os parámetros da función «evaluate» son:\n"
 "        <ul>\n"
 "        <li><b>formatter</b>: o formatador que se usa para avaliar o modelo\n"
 "        actual. Pode usalo para unha avaliación recursiva do modelo.</li>\n"
@@ -12853,10 +13176,10 @@ msgstr ""
 "        están neste dicionario.\n"
 "        <li><b>mi</b>: unha instancia de metadatos. Úsase para obter "
 "información\n"
-"        sobre os campos. Este parámetro pode ser \"None\" nalgúns casos, "
-"como cando\n"
+"        sobre os campos. Este parámetro pode ser «None» nalgúns casos, como "
+"cando\n"
 "        se avalían modelos non de libros.</li>\n"
-"        <li><b>locals</b>: as variables locais asignadas polo programa de\n"
+"        <li><b>locals</b>: as variábeis locais asignadas polo programa de\n"
 "        modelo actual.</li>\n"
 "        <li><b>os_seus_parámetros</b>: debe proporcionar un ou máis "
 "parámetros\n"
@@ -12864,7 +13187,7 @@ msgstr ""
 "excepto\n"
 "        se este é -1 (número variable de parámetros): neste caso o último "
 "argumento\n"
-"        debe ser \"*args\". Como mínimo requírese un parámetro, que é "
+"        debe ser «*args». Como mínimo requírese un parámetro, que é "
 "normalmente o\n"
 "        campo sobre o que se actúa. Teña en conta que cando se escribe no "
 "modo de\n"
@@ -12875,15 +13198,15 @@ msgstr ""
 "        <p>\n"
 "        A seguinte función de exemplo comproba o valor do campo. Se o campo "
 "non\n"
-"        está baleiro, o valor do campo é devoltoe en caso contrario "
+"        está baleiro, o valor do campo é devolto en caso contrario "
 "devólvese\n"
-"        o valor \"BALEIRO\".\n"
+"        o valor «BALEIRO».\n"
 "        <pre>\n"
 "        nome: my_ifempty\n"
 "        Número de parámetros: 1\n"
 "        Documentación: my_ifempty(val) -- devolve val se non está baleiro, e "
 "en\n"
-"        caso contrario devolve a cadea \"BALEIRO\".\n"
+"        caso contrario devolve a cadea «BALEIRO».\n"
 "        Código de programación:\n"
 "        def evaluate(self, formatter, kwargs, mi, locals, val):\n"
 "            if val:\n"
@@ -12978,30 +13301,34 @@ msgid "The main toolbar"
 msgstr "A barra principal de ferramentas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr "A segunda barra de ferramentas opcional"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "A barra principal de ferramentas cando un dispositivo esta conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "O menú de contexto para os libros na biblioteca de Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "O menú de conto para os libros que están no dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Non é posíbel engadir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Non é posíbel engadir as accións %s a esta localización"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Non é posíbel retirar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Non é posíbel retirar as accións %s desta localización"
 
@@ -13035,11 +13362,11 @@ msgstr "Retirar as accións seleccionadas da barra de ferramentas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:113
 msgid "This tweak has it default value"
-msgstr ""
+msgstr "Este axuste ten o valor predeterminado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:115
 msgid "This tweak has been customized"
-msgstr ""
+msgstr "Este axuste foi personalizado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:236
 msgid ""
@@ -13047,6 +13374,9 @@ msgid ""
 "these tweaks should be available on the website from where you downloaded "
 "the plugins."
 msgstr ""
+"Engadir ou modificar axustes para os complementos personalizados que teña "
+"instalados. A documentación destes axustes debería encontrarse na páxina web "
+"de onde descargou os complementos."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:277
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:317
@@ -13054,6 +13384,8 @@ msgid ""
 "There was a syntax error in your tweak. Click the show details button for "
 "details."
 msgstr ""
+"Hai un erro de sintaxe no axuste. Prema o botón «Amosar detalles» para máis "
+"información."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:330
 msgid "Invalid tweaks"
@@ -13073,34 +13405,39 @@ msgid ""
 "calibre. Your changes will only take effect <b>after a restart</b> of "
 "calibre."
 msgstr ""
+"Os valores dos axustes amósanse abaixo. Modifíqueos para cambiar o "
+"comportamento do Calibre. Os cambios só terán efecto <b>despois de reiniciar "
+"Calibre</b>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:89
 msgid "Edit tweaks for any custom plugins you have installed"
 msgstr ""
+"Modificar os axustes para calquera dos complementos personalizados que teña "
+"instalados"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:90
 msgid "&Plugin tweaks"
-msgstr ""
+msgstr "&Axustes de complementos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:92
 msgid "Edit tweak"
-msgstr ""
+msgstr "Modificar axuste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:93
 msgid "Restore this tweak to its default value"
-msgstr ""
+msgstr "Restaurar este axuste ao seu valor predeterminado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:94
 msgid "Restore &default"
-msgstr ""
+msgstr "Restabelecer valor pre&determinado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:95
 msgid "Apply any changes you made to this tweak"
-msgstr ""
+msgstr "Aplicar os cambios realizados neste axuste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Buscar"
@@ -13194,168 +13531,168 @@ msgstr "Faga clic para cambiar"
 msgid "&Alternate shortcut:"
 msgstr "Atallo &alternativo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Renomear %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr "Modificar orde para %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
-msgstr ""
+msgstr "Engadir %s á categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
-msgid "Delete search %s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
-msgid "Remove %s from category %s"
-msgstr ""
+msgstr "Subcategorías de %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+msgid "Delete search %s"
+msgstr "Borrar a busca %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+msgid "Remove %s from category %s"
+msgstr "Eliminar %s da categoría %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Buscar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "Buscar todo menos %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
-msgstr ""
+msgstr "Engadir unha subcategoría a %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
-msgstr ""
+msgstr "Eliminar a categoría de usuario %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Agochar categoría %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Mostrar categoría"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Buscar libros na categoría %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "Buscar libros fóra da categoría %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Administrar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Administrar buscas gardadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Administrar categorías de usuarios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Mostrar todas as categorías"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Cambiar o esquema de subcategorización"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
-msgstr ""
+msgstr "O nome do termo de busca agrupado é «{0}»"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Cambiar os autores de varios libros pode tardar bastante. Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Cambiar os metadatos de moitos libros pode tardar bastante. Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Buscas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
-msgstr ""
+msgstr "Cambiarlle o nome á categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
-msgstr ""
+msgstr "Non se poden usar puntos no nome das categorías de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
-msgstr ""
+msgstr "O nome %s xa se está a usar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Nome de busca duplicado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "El nome de busca gardado %s xa está en uso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
-msgstr ""
+msgstr "Nova categoría"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
-msgstr ""
+msgstr "Eliminar a categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
-msgstr ""
+msgstr "%s non é unha categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
-msgstr ""
+msgstr "%s contén elementos. Esta seguro de que quere borrala?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
-msgstr ""
+msgstr "Eliminar a categoría"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
-msgstr ""
+msgstr "A categoría de usuario %s non existe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
-msgstr ""
+msgstr "Engadir á categoría de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
-msgstr ""
+msgstr "Non existe ningunha categoría de usuario chamada %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Atopar o ítem no navegador de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13364,73 +13701,73 @@ msgid ""
 "*foo will filter all categories at once, showing only those items\n"
 "containing the text \"foo\""
 msgstr ""
-"Busca de ítems. Esta é unha busca de \"contidos\"; atoparanse os ítems\n"
+"Busca de ítems. Esta é unha busca de «contidos»; atoparanse os ítems\n"
 "que conteñan o texto en calquera parte do nome. Podes limitar a busca\n"
 "a categorías particulares usando a sintaxe de busca apropiada. Por exemplo,\n"
 "tags:foo atopará fou en calquera etiqueta, pero non en autores etc. "
 "Introducindo\n"
 "*fou filtraranse todas as categorías á vez, amosando só aqueles ítems que\n"
-"conteñan o texto \"fou\"."
+"conteñan o texto «fou»."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "A&topar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Atopar o ítem coincidente primeiro/seguinte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Contrae todas as categorías"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "Non hai Máis Coincidencias.</b><p> Preme en Atopar de novo para ir á "
 "primeira coincidencia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Ordenar polo nome"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Ordenar por popularidade"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Ordernar pola media de valoracións"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 "Configura forma de ordenación para entradas no Navegador de Etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Todos os criterios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Calquera criterio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Ao seleccionar varias entradas no navegador de etiquetas, buscar unha "
 "calquera o todas elas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Administrar categorías de &usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Engada as súas propias categorías ao navegador de etiquetas"
 
@@ -13509,23 +13846,23 @@ msgstr ""
 "de depuración estará dispoñíbel no ficheiro: %s<p>O rexistro mostrarase "
 "automaticamente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Produciuse un erro de conversión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Receita desactivada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Fallou</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13536,11 +13873,11 @@ msgstr ""
 "no dispositivo.<br>\n"
 "                      Está seguro de que desexa saír?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Tareas activas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13751,7 +14088,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opcións para personalizar o visualizador de libros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Lembrar o tamaño da última xanela usada"
 
@@ -13836,36 +14173,36 @@ msgstr ""
 "Aínda está modificando un atallo de teclado. Termine primeiro de facelo, "
 "pulsando fora do cadro de edición de atallos."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Buscar no dicionario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Ir a..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Sección seguinte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Sección anterior"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Inicio do documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Final do documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Inicio da sección"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Final da sección"
 
@@ -13941,78 +14278,78 @@ msgstr "Previsualización da impresión"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:303
 msgid "Clear list of recently opened books"
-msgstr ""
+msgstr "Limpar a lista dos libros abertos recentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Conectando a dict.org para buscar: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Escoller libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Libros electrónicos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Non se atoparon coincidencias con: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Cargando fluxo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Dispoñendo %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Marcador #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Engadir marcador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Introducir o título do marcador:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Xestionar os marcadores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Cargando libro..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Non se puido abrir o libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opcións de control do visor de libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Se se especifica, a xanela do visor tentará situarse na fronte cando se "
 "inicie o programa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Se se activa, a xanela do visor tentará iniciarse a pantalla completa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Dirixir alertas de JavaScript e mensaxes de consola á consola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -14090,27 +14427,27 @@ msgstr "Atopar a ocorrencia anterior"
 msgid "Print eBook"
 msgstr "Imprimir o libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Cambiar maiúsculas e minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Inverter mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Arrastre para axustar o tamaño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Agochar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Alternar"
 
@@ -14337,16 +14674,21 @@ msgid ""
 "You must either set both the username <b>and</b> password for the mail "
 "server or no username and no password at all."
 msgstr ""
+"Debe especificar o usuario <b>e</b> o contrasinal para o servidor de correo, "
+"ou ben non especificar ningún dos dous."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:219
 msgid "Please enter a username and password or set encryption to None "
 msgstr ""
+"Introduza o usuario e o constrasinal, ou estabeleza o cifrado en «Ningún» "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:224
 msgid ""
 "No username and password set for mailserver. Most  mailservers need a "
 "username and password. Are you sure?"
 msgstr ""
+"No se especificou usuario e contrasial do servidor de correo. A maioría dos "
+"servidores necesitan un usuario e contrasinal. Está seguro?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "Send email &from:"
@@ -14535,7 +14877,7 @@ msgstr ""
 "Campos dispoñibles: %s,\n"
 "máis os campos personalizados creados polo usuario.\n"
 "Exemplo: %s=title,authors,tags\n"
-"Valor predeterminado: \"%%default\"\n"
+"Valor predeterminado: «%%default»\n"
 "Aplícase a: formatos de saída CSV e XML"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:65
@@ -14602,7 +14944,7 @@ msgstr ""
 "Crear unha entrada para o ficheiro se os formatos están seleccionadas para "
 "as entradas BIBTEX.\n"
 "Valor booleano: True, False\n"
-"Valor predeterminado: \"%default\"\n"
+"Valor predeterminado: «%default»\n"
 "Aplícase a: formato de saída BIBTEX"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:272
@@ -14676,7 +15018,7 @@ msgstr ""
 "Garda a saída das distintas fases do proceso de conversión no directorio "
 "especificado. É útil se non está seguro de en que etapa do proceso ocorre un "
 "fallo.\n"
-"Valor predeterminado: \"%default\"\n"
+"Valor predeterminado: «%default»\n"
 "Aplícase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:624
@@ -14686,9 +15028,9 @@ msgid ""
 "Default: '%default'\n"
 "Applies to ePub, MOBI output formats"
 msgstr ""
-"field:pattern especificando contidos/campos personalizables que indiquen "
-"libros deberán excluirse.\n"
-"Predeterminado: \"%default\"\n"
+"field:pattern especificando contidos/campos personalizábeis que indiquen "
+"libros deberán excluírse.\n"
+"Predeterminado: «%default»\n"
 "Aplícase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:631
@@ -14709,8 +15051,8 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 "Lista de etiquetas que indican que debe excluírse un libro da saída, "
-"separadas por comas. Por exemplo, \"salta\" coincide con \"salta este "
-"libro\" e con \"folclore de Salta\". Valor predeterminado: '%default'\n"
+"separadas por comas. Por exemplo, «salta« coincide con «salta este libro» e "
+"con «folclore de Salta». Valor predeterminado: «%default»\n"
 "Aplicase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:645
@@ -14719,8 +15061,8 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Inclúe unha sección \"Autores\" no catálogo.\n"
-"Valor predeterminado: \"%default\"\n"
+"Inclúe unha sección «Autores» no catálogo.\n"
+"Valor predeterminado: «%default»\n"
 "Aplícase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:652
@@ -14729,8 +15071,8 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Inclúe unha sección \"Descripcións\" no catálogo.\n"
-"Valor predeterminado: \"%default\"\n"
+"Inclúe unha sección «Descricións» no catálogo.\n"
+"Valor predeterminado: «%default»\n"
 "Aplícase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:659
@@ -14739,8 +15081,8 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Incluír a sección 'Xéneros' no catálogo.\n"
-"Predeterminado: \"%default\"\n"
+"Incluír a sección «Xéneros» no catálogo.\n"
+"Predeterminado: «%default»\n"
 "Aplícase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:666
@@ -14779,9 +15121,9 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"O campo personalizable que contén texto de notas a insertar no Encabezado "
-"descritivo.\n"
-"Predeterminado: \"%default\"\n"
+"O campo personalizabel que contén texto de notas a inserir na cabeceira "
+"descritiva.\n"
+"Predeterminado: «%default»\n"
 "Aplícase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:694
@@ -14793,13 +15135,13 @@ msgid ""
 "Default: '%default'\n"
 "Applies to ePub, MOBI output formats"
 msgstr ""
-"<custom field>:[before|after]:[True|False] specificando:\n"
-" <custom field> Campo personalizable que contén as notas a fundir cos "
-"Comentarios\n"
-" [before|after] Posición das notas con respecto aos Comentarios\n"
+"<custom field>:[before|after]:[True|False] especificando:\n"
+" <custom field> Campo personalizabel que contén as notas a mesturar cos "
+"comentarios\n"
+" [before|after] Posición das notas con respecto aos comentarios\n"
 " [True|False] - Insírese unha liña horizontal entre as notas e os "
-"Comentarios\n"
-"Predeterminado: \"%default\"\n"
+"comentarios\n"
+"Predeterminado: «%default»\n"
 "Aplícase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:704
@@ -14836,7 +15178,7 @@ msgid ""
 msgstr ""
 "Tamaño da indicación (en polgadas) para as portadas de libros no catálogo.\n"
 "Rango: 1.0 - 2.0\n"
-"Predeterminado: \"%default\"\n"
+"Predeterminado: «%default»\n"
 "Aplícase a: formatos de saída ePub e MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:725
@@ -14867,6 +15209,13 @@ msgid ""
 "Select all books by '{0}', apply correct Author Sort value in Edit Metadata "
 "dialog, then rebuild the catalog.\n"
 msgstr ""
+"Valores de ordenación de autor inconsistentes para\n"
+"Autor «{0}»:\n"
+"«{1}» <> «{2}»\n"
+"Non se pode xerar o catálogo MOBI.\n"
+"\n"
+"Seleccione todos os libros de «{0}» e estabeleza a orde de autor correcta\n"
+"no cadro de edición de metadatos, despois volva a xerar o catálogo.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:1504
 msgid ""
@@ -14874,6 +15223,9 @@ msgid ""
 "Author '{0}':\n"
 "'{1}' <> '{2}'\n"
 msgstr ""
+"Aviso: valores de orde de autor inconsistentes para\n"
+"Autor «{0}»:\n"
+"«{1}» <> «{2}»\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:1700
 msgid ""
@@ -14881,7 +15233,7 @@ msgid ""
 "Check 'Excluded books' criteria in E-book options.\n"
 msgstr ""
 "Non se atoparon libros para catalogar.\n"
-"Comprobe os criterios de \"Libros excluídos\" nas opcións de libro "
+"Comprobe os criterios de «Libros excluídos» nas opcións de libro "
 "electrónico.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:1702
@@ -14894,7 +15246,7 @@ msgid ""
 "*** Adding 'By Authors' Section required for MOBI output ***"
 msgstr ""
 "\n"
-"*** A sección \"Por autor\" é necesaria para a saída MOBI ***"
+"*** A sección «Por autor» é necesaria para a saída MOBI ***"
 
 #: /home/kovid/work/calibre/src/calibre/library/check_library.py:26
 msgid "Invalid titles"
@@ -14965,7 +15317,7 @@ msgstr ""
 "Os campos para mostrar cando se listan libros na base de datos. Deberían ser "
 "unha lista de campos separados por vírgulas.\n"
 "Campos dispoñíbeis: %s\n"
-"Predeterminado: %%default. O campo especial \"todo\" pode usarse para "
+"Predeterminado: %%default. O campo especial «todo» pode usarse para "
 "seleccionar todos os campos. Soamente ten efecto no formato de texto de "
 "saída."
 
@@ -15612,11 +15964,11 @@ msgstr ""
 "\n"
 "Para ver a axuda de cada orde execute: %%prog orde --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Non se forneceu ningunha etiqueta"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15632,17 +15984,17 @@ msgstr "%sA valoración promedio é %3.1f"
 msgid "Main"
 msgstr "Principal"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Migrando a base de datos antiga á biblioteca de libros electrónicos en "
 "%s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Compactando a base de datos"
 
@@ -15652,7 +16004,7 @@ msgstr "Valoracións"
 
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:181
 msgid "Identifiers"
-msgstr ""
+msgstr "Identificadores"
 
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:301
 msgid "Title Sort"
@@ -15766,8 +16118,8 @@ msgid ""
 "subdirectory with filenames containing title and author. Available controls "
 "are: {%s}"
 msgstr ""
-"O modelo para controlar o nome e a estrutura de cartafafoles dos ficheiros "
-"gardados. O valor predeterminado é \"%s\", o que gardará os libros nun "
+"O modelo para controlar o nome e a estrutura de cartafoles dos ficheiros "
+"gardados. O valor predeterminado é «%s», o que gardará os libros nun "
 "subcartafol por autor con nomes de ficheiro que conteñen o título e o autor. "
 "As variábeis de control dispoñíbeis son: {%s}"
 
@@ -15779,7 +16131,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 "O modelo para controlar o nome do ficheiro e a estrutura do cartafol  dos "
-"ficheiros enviados ao dispositivo. De modo predeterminado é \"%s\" o que "
+"ficheiros enviados ao dispositivo. De modo predeterminado é «%s» o que "
 "gardará os libros nun cartafol por autor co título e o nome do autor no nome "
 "de cada ficheiro. Os controis dispoñíbeis son: {%s}"
 
@@ -15872,7 +16224,7 @@ msgid ""
 "Prefix to prepend to all URLs. Useful for reverseproxying to this server "
 "from Apache/nginx/etc."
 msgstr ""
-"Prefixo para antepor a todos os URL. Útil para \"reverseproxying\" a este "
+"Prefixo para antepor a todos os URL. Útil para «reverseproxying» a este "
 "servidor Apache/nginx/etc."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:64
@@ -16132,6 +16484,10 @@ msgid ""
 "and consume more resources. Most tasks like conversion/news download/adding "
 "books/etc. are affected by this setting."
 msgstr ""
+"A prioridade dos procesos en execución. Unha prioridade máis alta significa "
+"que se executan más rápidamente e consomen máis recursos. A maioría das "
+"tarefas, como a conversión, descarga de noticias, adición de libros, etc., "
+"vense afectadas por esta configuración."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:722
 msgid "Swap author first and last names when reading metadata"
@@ -16163,6 +16519,9 @@ msgid ""
 "When searching for text without using lookup prefixes, as for example, Red "
 "instead of title:Red, limit the columns searched to those named below."
 msgstr ""
+"Cando se busque texto sen usar prefixos, como «Vermello» en lugar de "
+"«title:Vermello», limitar as columnas buscadas a aquelas que se enumeran a "
+"seguir."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:740
 msgid ""
@@ -16171,6 +16530,10 @@ msgid ""
 "separated by commas. Only takes effect if you set the option to limit search "
 "columns above."
 msgstr ""
+"Escolla as columnas nas que se buscará cando non se usen prefixos, como "
+"cando se busca «Vermello» en lugar de «title:Vermello». Introduza unha lista "
+"de nomes de busca separados por comas. Só ten efecto se activa a opción de "
+"limitar as columnas de busca máis arriba."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:27
 msgid "failed to scan program. Invalid input {0}"
@@ -16304,7 +16667,7 @@ msgid ""
 "template processor to construct complex results from local variables."
 msgstr ""
 "eval(modelo) -- avalía o modelo, pasando as variábeis locais (as definidas "
-"con \"assign\") no canto dos metadatos do libro. Isto permite usar o "
+"con «assign») no canto dos metadatos do libro. Isto permite usar o "
 "procesador de modelos para elaborar resultados complexos a partir de "
 "variábeis locais."
 
@@ -16334,6 +16697,8 @@ msgid ""
 "raw_field(name) -- returns the metadata field named by name without applying "
 "any formatting."
 msgstr ""
+"raw_field(nome) -- devolve o campo de metadatos chamado «nome» sen aplicar "
+"ningún formato."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:246
 msgid ""
@@ -16360,7 +16725,7 @@ msgid ""
 "constructing variable save paths"
 msgstr ""
 "lookup(val, patrón, campo, patrón, campo, ..., outro_campo) -- como "
-"\"switch\", pero os argumentos son nomes de campo (metadatos), non texto. "
+"«switch», pero os argumentos son nomes de campo (metadatos), non texto. "
 "Usarase o valor do campo apropiado. Teña en conta que posto que as columnas "
 "compostas son campos, pode usar esta función nun campo composto para usar o "
 "valor doutro campo composto. Isto é moi útil para construír rutas para  "
@@ -16484,6 +16849,9 @@ msgid ""
 "with the items being \"id:value\". Find the pair with theid equal to key, "
 "and return the corresponding value."
 msgstr ""
+"select(val, clave) -- interpreta o valor como unha lista de valores "
+"separados por comas, cos elementos da forma «id:valor». Encontra a parella "
+"con «id» igual a «val» e devolve o «valor» correspondente."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:429
 msgid ""
@@ -16497,6 +16865,16 @@ msgid ""
 "{tags:sublist(-1,0,\\,)} returns \"C\". {tags:sublist(0,-1,\\,)} returns "
 "\"A, B\"."
 msgstr ""
+"sublist(val, índice_inicio, índice_fin, separador) -- interpreta o valor "
+"como unha lista de elementos separados por «separador» e devolve unha nova "
+"lista cos elementos comprendidos entre a posición «índice_inicio» e "
+"«índice_fin». O primeiro elemento ocupa a posición cero. Se un índice é "
+"negativo, cóntase desde o final da lista. Como caso especial, se "
+"«índice_fin» é cero, considérase como final da lista. Exemplos no modo "
+"básico de modelo e supoñendo que a columna de etiquetas (definida como "
+"valores separados por comas) contén «A, B, C»: {tags:sublist{0,1,\\,)} "
+"devolve «A», {tags:sublist(-1,0,\\,)} devolve «C», {tags:sublist(0,-1,\\,)} "
+"devolve «A, B»."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:458
 msgid ""
@@ -16515,6 +16893,20 @@ msgid ""
 "{#genre:subitems(0,1)} returns \"A, D\". {#genre:subitems(0,2)} returns "
 "\"A.B, D.E\""
 msgstr ""
+"subitems(val, índice_inicio, índice_fin) -- Esta función úsase para separar "
+"listas de elementos tales como os xéneros. Interpreta o valor como unha "
+"lista de elementos separados por comas, onde cada elemento é á súa vez unha "
+"lista de elementos separados por puntos. Devolve unha nova lista formada "
+"tomando, de cada lista de elementos separados por puntos, os elementos "
+"situados entre as posicións «índice_inicio» e «índice_fin» e combinando os "
+"resultados. O primeiro elemento de cada lista separada por puntos ocupa a "
+"posición cero. Se un índice é negativo, cóntase desde o final da lista. Como "
+"caso especial, se «índice_fin» é cero, considérase como final da lista. "
+"Exemplos no modo básico de modelo e supoñendo que a columna #genre contén o "
+"valor «A.B.C»: {#genre:subitems(0,1)} devolve «A», {#genre:subitems(0,2)} "
+"devolve «A.B», {#genre:subitems(1,0)} devolve «B.C». Supoñendo que #genre "
+"contén o valor «A.B.C, D.E.F»: {#genre:subitems(0,1)} devolve «A, D», "
+"{#genre:subitems(0,2)} devolve «A.B, D.E»."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:495
 msgid ""
@@ -16530,6 +16922,18 @@ msgid ""
 "\"December\"). yy   : the year as two digit number (00 to 99). yyyy : the "
 "year as four digit number."
 msgstr ""
+"format_date(val, texto_formato) -- dá formato a un valor, que debe ser un "
+"campo de data, segundo «texto_formato» e devolve un texto. Os códigos de "
+"formato son: «d»: o día como un número, sen cero inicial (de 1 a 31). «dd»: "
+"o día como un número, cun cero inicial se é necesario (de 01 a 31). «ddd»: o "
+"día da semana abreviado segundo o idioma local (p. ex. de «lun» a «dom»). "
+"«dddd»: o nome local completo do día da semana (p. ex. de «luns» a "
+"«domingo»). «M»: o mes como un número sen cero inicial (de 1 a 12). «MM»: o "
+"mes como un número, cun cero inicial se é necesario (de 01 a 12). «MMM»: o "
+"mes abreviado segundo o idioma local (p. ex. de «xan» a «dic»). «MMMM»: o "
+"nome local completo do mes (p. ex. de «xaneiro» a «decembro»). «yy»: o ano "
+"como un número de dúas cifras (de 00 a 99). «yyyy»: o ano como un número de "
+"catro cifras."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:522
 msgid "uppercase(val) -- return value of the field in upper case"
@@ -16615,7 +17019,7 @@ msgstr "Inglés (Chipre)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Czechoslovakia)"
-msgstr ""
+msgstr "Inglés (Checoslovaquia)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Pakistan)"
@@ -16627,7 +17031,7 @@ msgstr "Inglés (Croacia)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (Indonesia)"
-msgstr ""
+msgstr "Inglés (Indonesia)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "English (Israel)"
@@ -16819,96 +17223,96 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Fonte de novas descoñecida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
-msgstr "A receita \"%s\" necesita un nome de usuario e un contrasinal."
+msgstr "A receita «%s» necesita un nome de usuario e un contrasinal."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Rematou a descarga"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " desde "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tLigazóns erradas:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "Non se puido obter o artigo."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 "O resultado do rastreo de depuración aparece máis arriba neste rexistro"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr "Execute co parámetro -vv para ver o motivo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "A obter os fluxos..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Obtivéronse fontes de noticias da páxina principal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Tratando de descargar a cuberta..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Xerando o tope..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Comezando a descarga [%d fío(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Fluxos descargados en %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Non se puido descargar a cuberta: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Descargando a cuberta desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Tope da imaxe descargada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Artigo sen título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artigo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Erro ao descargar o artigo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Obtendo o fluxo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16916,7 +17320,7 @@ msgstr ""
 "No se pudo iniciar a sesión, comprobe o seu nome de usuario ou contrasinal "
 "do servizo de boletín do Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17692,6 +18096,9 @@ msgstr "Non descargar follas de estilo CSS"
 #~ msgid "&Tweaks"
 #~ msgstr "Axus&tes"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Personalizar a barra de ferramentas"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Comunicar co Kogan"
 
@@ -17958,6 +18365,9 @@ msgstr "Non descargar follas de estilo CSS"
 #~ "ten 4 valores correctos, un deles nulo. O primeiro valor na lista é o\n"
 #~ "valor predeterminado."
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Dividir a barra de ferramentas en dous"
+
 #~ msgid ""
 #~ "The first value entered will be the default value for this enumeration"
 #~ msgstr ""
@@ -18013,6 +18423,9 @@ msgstr "Non descargar follas de estilo CSS"
 #~ msgid "Remove all"
 #~ msgstr "Retirar todo"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Non se atoparon engadidos correctos en "
+
 #~ msgid ""
 #~ "If books with similar titles and authors found, &merge the new files "
 #~ "automatically"
@@ -18883,3 +19296,6 @@ msgstr "Non descargar follas de estilo CSS"
 
 #~ msgid "Markdown Options"
 #~ msgstr "Opciones de markdown"
+
+#~ msgid "Customize searching"
+#~ msgstr "Personalizar as buscas"
diff --git a/src/calibre/translations/he.po b/src/calibre/translations/he.po
index e813c47ee2..f386d97ac6 100644
--- a/src/calibre/translations/he.po
+++ b/src/calibre/translations/he.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-01-28 13:47+0000\n"
 "Last-Translator: Eran Cohen <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: 2011-03-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:44+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "לא עושה דבר"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "לא עושה דבר"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "לא עושה דבר"
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "בסיס"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "התאמה אישית"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "סוג קובץ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "בדיקת תגיות מטא"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "כתיבת תגיות מטא"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "יצירת קטלוג"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "פעולה בממשק משתמש"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "העדפות"
@@ -331,8 +331,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "הוסף/הסר טורים אישיים לרשימת הספרים של קליבר"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "התאם אישית את סרגל הכלים"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -341,7 +341,7 @@ msgid ""
 msgstr "התאם אישית סרגלי כלים ותפריטי מידע, שנה את הפעולות האפשריות בכל אחד."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -665,35 +665,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "הפרופיל הזה מיועד ל'סאנדה במבוק' (Sanda Bambook)."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "תוספים מותקנים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "ערוך מיפוי עבור התקנים של סוגי קבצים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "התאמה אישית לתוסף מקומי."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "תוספים מבוטלים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "תוספים פעילים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "לא נמצאו תוספים תקינים ב- "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "אתחול הרכיב ה-  %s נכשל עם מעקב החזרה (traceback)"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -705,29 +701,29 @@ msgstr ""
 "    התאם את קליבר על ידי טעינת רכיב חיצוני\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "הסר רכיב מותאם לפי שם. ללא השפעה על הרכיבים המותקנים בהתקנה ראשונית."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "התאמת רכיב. ציין שם רכיב ומחרוזת התאמה מופרדים על ידי פסיק."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "הצג את כל הרכיבים המותקנים."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "אפשר את הרכיב המצויין"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "הפסק את הרכיב המצויין"
 
@@ -749,43 +745,55 @@ msgstr "רשימת ספריות מופרדות בפסיקל שליחת ספרש
 msgid "Communicate with S60 phones."
 msgstr "תקשר עם סלולרי S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "הטמן (cache) תמונות שער מ-iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "התקן של אפל"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "תקשר עם אייטונס/אייבוקס"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "התגלתה חומרת 'אפל' (Apple). מתחיל את תוכנת iTunes, אנה חכה.."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -793,27 +801,27 @@ msgstr ""
 "קליבר לא מצליח להעתיק ספרים ישירות מחומרת ה-iDevice. גרור מספריית ה-iTunes "
 "לשולחן העבודה. רק אז הוסף לחלון ספריית קליבר."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "מעדכן רישום נתוני מטא של החומרה"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d מתוך %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "הסתיים"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -823,7 +831,7 @@ msgstr ""
 "הסר בעזרת אפליקציית ה-iBooks.\n"
 "לחץ על 'הצג פרטים' לקבלת רשימה."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -831,31 +839,31 @@ msgstr ""
 "לא היה אפשר להמיר חלק מתמונות השער.\n"
 "לחץ על 'הצג פרטים' לקבלת רשימה."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "חדשות"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "קטלוג"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "תקשר עם אייטונס"
 
@@ -899,20 +907,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "קורא את רשימת הספרים מההתקן..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "מעביר ספרים למכשיר"
 
@@ -920,8 +928,8 @@ msgstr "מעביר ספרים למכשיר"
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "מוסיף ספרים לרשימת הספרים במכשיר"
 
@@ -931,8 +939,8 @@ msgstr "מוסיף ספרים לרשימת הספרים במכשיר"
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "מסיר ספרים מהמכשיר"
 
@@ -940,17 +948,17 @@ msgstr "מסיר ספרים מהמכשיר"
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "מסיר ספרים מרשימת הספרים במכשיר"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "שולח מטא תגיות למכשיר"
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1253,32 +1261,32 @@ msgstr "תקשר עם קורא הספרים סוני PRS-500"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "תקשר עם כל קוראי הספרים של סוני"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1287,29 +1295,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1445,7 +1464,7 @@ msgstr "הגדרות נוספות"
 msgid "Communicate with an eBook reader."
 msgstr "מחליף נתונים עם eBook reader"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "מקבל מידע ממכשיר..."
 
@@ -2087,7 +2106,7 @@ msgstr "ממיר את הקלט ל-HTML..."
 msgid "Running transforms on ebook..."
 msgstr "מריץ שינויים על הספר..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "מייצר"
 
@@ -2202,7 +2221,7 @@ msgstr "התחל"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "אל תשים את תוכן העניינים בתחילת הספר."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2213,6 +2232,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2569,105 +2592,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3050,7 +3073,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3183,7 +3206,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3349,6 +3372,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3613,135 +3637,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3949,8 +3977,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4147,7 +4175,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4213,7 +4241,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4221,7 +4249,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4402,7 +4430,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4410,32 +4438,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4522,26 +4550,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4549,7 +4577,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4561,7 +4589,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4572,19 +4600,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4649,7 +4677,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4891,7 +4919,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5093,8 +5121,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5104,17 +5132,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5124,25 +5152,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5200,7 +5228,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5223,14 +5251,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5795,10 +5823,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6390,7 +6422,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6975,97 +7007,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7351,7 +7383,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7487,7 +7519,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7534,8 +7566,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7567,12 +7599,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7756,22 +7788,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9251,12 +9283,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9325,7 +9357,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9560,61 +9592,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9628,67 +9660,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9896,48 +9946,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10012,7 +10062,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10029,12 +10079,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10840,25 +10890,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10870,91 +10927,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10963,22 +11020,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10988,64 +11045,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11776,30 +11829,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11896,7 +11953,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11989,166 +12046,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12158,60 +12215,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12284,34 +12341,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12511,7 +12568,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12589,36 +12646,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12694,73 +12751,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12835,27 +12892,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14021,11 +14078,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14039,15 +14096,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15084,101 +15141,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "מקור חדשות בלתי ידוע"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "ההורדה הסתיימה"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "הורדת הכתבות הבאות כשלה:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "מנסה להוריד עמוד שער/כריכה..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "לא הצליח להוריד כריכה: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "מוריד כריכה מ-%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "כתבה ללא שם"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "כתבה הורדה: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "הורדת הכתבה כשלה: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15293,6 +15350,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr "לא להוריד דפי-סגנון CSS"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "לא נמצאו תוספים תקינים ב- "
+
 #~ msgid "Path to a txt file containing a comment."
 #~ msgstr "נתיב לקובץ TXT המכיל הערה."
 
@@ -15313,6 +15373,9 @@ msgstr "לא להוריד דפי-סגנון CSS"
 #~ msgid "  "
 #~ msgstr "  "
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "התאם אישית את סרגל הכלים"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "תקשר עם קוגן"
 
diff --git a/src/calibre/translations/hi.po b/src/calibre/translations/hi.po
index 913a12e564..7b7dd4a67d 100644
--- a/src/calibre/translations/hi.po
+++ b/src/calibre/translations/hi.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-19 05:11+0000\n"
 "Last-Translator: Varun Kansal <Unknown>\n"
 "Language-Team: Hindi <hi@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: 2011-03-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:44+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "कुछ भी नहीं करता"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "कुछ भी नहीं करता"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "कुछ भी नहीं करता"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "कुछ भी नहीं करता"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "कुछ भी नहीं करता"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "कुछ भी नहीं करता"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "कुछ भी नहीं करता"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "कुछ भी नहीं करता"
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "आधार"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "रुचि के अनुसार बनाना"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "फ़ाइल प्रकार"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "उपयोगकर्ता इंटरफ़ेस कार्य"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "वरियता"
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/hr.po b/src/calibre/translations/hr.po
index 6e9a242dfb..9fc0f24d82 100644
--- a/src/calibre/translations/hr.po
+++ b/src/calibre/translations/hr.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-10-08 20:47+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
 "Language-Team: Croatian <hr@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: 2011-03-27 04:47+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:50+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Uopće ne funkcionira"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Uopće ne funkcionira"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Uopće ne funkcionira"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Uopće ne funkcionira"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Uopće ne funkcionira"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Uopće ne funkcionira"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Uopće ne funkcionira"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Uopće ne funkcionira"
 msgid "Unknown"
 msgstr "Nepoznat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Osnova"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Prilagodi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Nemoguće konfigurirati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Vrsta datoteke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Čitač metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Pisač metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generator kataloga"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Postavke"
@@ -330,8 +330,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Prilagodi traku s alatima"
+msgid "Toolbar"
+msgstr "Alatna traka"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -663,35 +663,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Instalirani priključci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Kartiranje priključaka za vrste datoteka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Prilagođavanje lokalnih priključaka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Onesposobljeni priključci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Omogućeni priključci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Nije pronađen važeći priključak u "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicijalizacija priključka %s je neuspjela sa praćenjem unazad:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -703,18 +699,18 @@ msgstr ""
 "    Prilagodi calibre učitavanjem vanjskih priključaka.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Dodaj priključak specificirajući put do ZIP datoteke u kojoj se nalazi."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Ukloni prilagođene priključke po imenu. Ovo neće utjecati na ugrađene "
 "priključke."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -722,15 +718,15 @@ msgstr ""
 "Prilagodi priključak. Specificiraj naziv priključka i prilagodbeni string "
 "odvojene zarezom."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Izlistaj sve instalirane priključke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Osposobi imenovani priključak"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Onesposobi imenovani priključak"
 
@@ -752,106 +748,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d od %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "završeno"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Vijesti"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -895,20 +903,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Uzimanje liste knjiga na uređaju..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Prenošenje knjiga na uređaj..."
 
@@ -916,8 +924,8 @@ msgstr "Prenošenje knjiga na uređaj..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Dodavanje knjiga u popis metapodataka uređaja..."
 
@@ -927,8 +935,8 @@ msgstr "Dodavanje knjiga u popis metapodataka uređaja..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Uklanjanje knjiga sa uređaja..."
 
@@ -936,17 +944,17 @@ msgstr "Uklanjanje knjiga sa uređaja..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Uklanjanje knjiga iz popisa metapodataka uređaja..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Slanje metapodataka na uređaj..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1245,32 +1253,32 @@ msgstr "Komuniciraj sa Sony PRS-500 eBook čitačem."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1279,29 +1287,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1434,7 +1453,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr "Komuniciraj sa eBook čitačem."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Uzmi informacije o uređaju..."
 
@@ -2195,7 +2214,7 @@ msgstr "Pretvaranje ulaza u HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Izvršavanje transformacija na e-knjizi..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Stvaranje"
 
@@ -2324,7 +2343,7 @@ msgstr "Kreni"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Nemoj umetnuti Sadržaj na početak knjige."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2335,6 +2354,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2718,105 +2741,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Ne"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Da"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Naslov"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Izdavač"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Proizvođač"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Komentari"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Tagovi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Serije"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Jezik"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Vremenska oznaka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Objavljeno"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Prava"
 
@@ -3233,7 +3256,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3368,7 +3391,7 @@ msgid "HTML TOC generation options."
 msgstr "Opcije generiranja HTML TOC."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3565,6 +3588,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Predmet"
 
@@ -3869,139 +3893,143 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Pošalji datoteku na memorijsku karticu namjesto u glavnu memoriju po zadatku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Potvrdi prije brisanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Geometrija glavnog prozora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Obavijesti kad je nova inačica dostupna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Upotrijebi Rimske brojeve za brojeve serija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Broj omota za prikazati u modu pretraživanja omota"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Podrazumijeva se za pretvorbu u LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opcije za LRF ebook preglednika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formati koji se pregledavaje upotrebom internog preglednika."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Stupci koji se prikazuju u listi knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Automatski lansiranje sadržajnog poslužitelja pri podizanju aplikacije."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Najstarija vijest sadržana u bazi podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Prikaži ikonu sustavnog poslužavnika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Pošalji skinute vijesti na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Izbriši knjige iz biblioteke nakon slanja na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 "Prikaži protok omota u posebnom prozoru umjesto u glavnom calibre prozoru."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Onesposobi obavještavanja sa ikone sustavnog poslužavnika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Zadana akcija koju treba uraditi kad je kliknut gumb za slanje na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maksimalan broj radnih procesa na čekanju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Preuzmi socijalne metapodatke (oznake/ocjene/itd)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Odaberi Daoteke"
 
@@ -4214,8 +4242,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Niste odabrali knjigu"
@@ -4412,7 +4440,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4478,7 +4506,7 @@ msgid "Bulk convert"
 msgstr "Pretvori grupno"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Nemoguće pretvoriti"
 
@@ -4486,7 +4514,7 @@ msgstr "Nemoguće pretvoriti"
 msgid "Starting conversion of %d book(s)"
 msgstr "Pokretanje konverzije %d knjige(a)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4667,7 +4695,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Email"
 
@@ -4675,32 +4703,32 @@ msgstr "Email"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Pošalji na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4787,26 +4815,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Nemoguće urediti metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4814,7 +4842,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4826,7 +4854,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4837,19 +4865,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Pribavi vijesti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Pribavljanje vijesti sa "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " pribavlljeno."
 
@@ -4914,7 +4942,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Pokreni asistenta dobrodošlice"
 
@@ -5160,7 +5188,7 @@ msgid "The specified directory could not be processed."
 msgstr "Specificirani direktorij nije mogao biti procesiran."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nema knjiga"
 
@@ -5366,8 +5394,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Put"
 
@@ -5377,17 +5405,17 @@ msgstr "Put"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Kolekcije"
 
@@ -5397,25 +5425,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Nijedan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5473,7 +5501,7 @@ msgstr "izlaz"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5496,14 +5524,14 @@ msgstr "izlaz"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6078,10 +6106,14 @@ msgstr "Nemoj umetnuti &Sadržaj na početak knjige."
 msgid "FB2 Output"
 msgstr "FB2 Izlaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Mađioničar dimenzioniranja pisma"
@@ -6679,7 +6711,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7270,21 +7302,21 @@ msgstr "Greška"
 msgid "Error communicating with device"
 msgstr "Greška u komunikaciji sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Nema odgovarajućih formata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Greška u razgovoru sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7292,67 +7324,67 @@ msgstr ""
 "Došlo je do privremene greške u komunikaciji sa uređajem. Molimo islkjučite "
 "i ponovo priključite uređaj ili kompletno ponovo pokrenite sustav."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Uređaj: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " otkriveno."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "odabrano za slanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Odaberi format za poslati na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Nema uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Nemoguće poslati: Nijedan uređaj nije priključen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Nema kartice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Nemoguće poslati: Uređaj nema memorijsku karticu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Automatski konvertiraj slijedeće knjige prije otpreme na uređaj?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Slanje kataloga na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Slanje vijesti na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Slanje knjiga na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7360,11 +7392,11 @@ msgstr ""
 "Nije moguće otpremiti slijedeće knjige na uređaj, jer odgovarajući formati "
 "nisu pronađeni. Prvo pretvorite knjige u format podržan od vašeg uređaja."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Nema prostora na uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7651,7 +7683,7 @@ msgstr "Odaberi Format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -7787,7 +7819,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7834,8 +7866,8 @@ msgid "Location"
 msgstr "Lokacija"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7867,12 +7899,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -8061,22 +8093,22 @@ msgid "Working"
 msgstr "Radim"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Mala Slova"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Velika Slova"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Veličina Slova Naslova"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9569,12 +9601,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9643,7 +9675,7 @@ msgid "Send test mail from %s to:"
 msgstr "Pošalji probnu poštu od %s do:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Provjera"
 
@@ -9889,63 +9921,63 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Vijesti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-knjiga:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Priloženo, pronaći ćete e-knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "u %s formatu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Slanje e-pošte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "Automatski konvertiraj slijedeće knjige prije otpreme e-mailom?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Nije moguće opremiti e-mailom slijedeće knjige jer nisu pronađeni "
 "odgovarajući formati:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Vijesti poslane u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9959,67 +9991,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Regularni &izraz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Ime datoteke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Naslov:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regularni izraz (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Ne odgovara"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Regularni izraz (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Serije:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regularni izraz (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Indeks serija:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regularni izra (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regularni izraz (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10229,48 +10279,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Veličina (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Knjiga <font face=\"serif\">%s</font> od %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Duplo klikni za <b>urediti</b> mene<br><br>"
 
@@ -10348,7 +10398,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "Podudarnosti za pretražnu frazu <i>%s</i> <b>nisu pronađene.</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Podudarnosti nisu pronađene"
 
@@ -10365,12 +10415,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Alatna Traka LRF Preglednika"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Slijedeća Stranica"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Prethodna Stranica"
 
@@ -11183,19 +11233,26 @@ msgstr "Napravi &zadanim"
 msgid "&Remove email"
 msgstr "&Ukloni e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Auto slanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Epošta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formati epošte. Prvi odgovarajući format će biti poslan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11203,7 +11260,7 @@ msgstr ""
 "Ako je označeno, skinute vijesti će biti automatski poslane<br>na ovu e-mail "
 "adresu (ako je u jednom od navedenih formata)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "nova epoštanska adresa"
 
@@ -11215,94 +11272,94 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Srednji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Malo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Velik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Broj omota za prikaz u pretražnom modu (zahtijeva ponovno pokretanje):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Odaberi &jezik (zahtijeva ponovno pokretanje):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Osposobi ikonu sustavnog &poslužavnika (zahtijeva ponovo podizanje sustava)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Prikaži pretraživača omota u posebnom prozoru (zahtijeva ponovno podizanje)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11311,22 +11368,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11336,64 +11393,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -12151,30 +12204,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12271,7 +12328,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Pretraga"
@@ -12364,166 +12421,166 @@ msgstr "Klikni da promijeniš"
 msgid "&Alternate shortcut:"
 msgstr "&Alternativna prečica:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12533,60 +12590,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Spari sve"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Spari bilo koje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12663,23 +12720,23 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Greška u Pretvorbi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Recept Onesposobljen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Neuspjelo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Imate aktivne poslove. Jeste li sigurni da hoćete prekinuti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -12689,11 +12746,11 @@ msgstr ""
 "                      Prekid može prouzrokovati korupciju uređaja.<br>\n"
 "                      Jeste li sigurni da hoćete da prekinete?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12897,7 +12954,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opcije za prilagodbu preglednika elektroničke knjige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Zapamti zadnju korištenu veličinu zaslona"
 
@@ -12977,36 +13034,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Pogledaj u rječniku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Idi na..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -13084,75 +13141,75 @@ msgstr "Pregled Ispisa"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Odaberi elektroničku knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Elektroničke knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Nisu pronađeni parovi za: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Učitavanje protoka..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Izlaganje %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Dodaj knjižnu oznaku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Unesi naziv knjižne oznake:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Upravljaj Knjižnim Oznakama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Učitavanje elektroničke knjige..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Nemoguće otvoriti elektroničku knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opcije za kontrolu preglednika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Ako je naznačeno, kod pokretanj će preglednički prozor pokušati da dođe "
 "ispred."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Ispiši javascript upozorenje i poruke na kontrolnu ploču"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13230,27 +13287,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Ispiši eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Promijeni Veličinu Slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Zamijeni Veličinu Slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14517,11 +14574,11 @@ msgstr ""
 "\n"
 "For help on an individual command: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14535,16 +14592,16 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Preseljavanje stare baze podataka na ebook biblioteku u %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopiranje <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Sažimanje baze podataka"
 
@@ -15608,101 +15665,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Nepoznat Izvor Vijesti"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "\"%s\" recept treba korisničko ime i lozinku."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Skidanje završeno"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Neuspjelo skidanje slijedećih artikala:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "Neuspjelo skidanje dijelova slijedećih artikala:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " od "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tNeuspjele veze:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Hvatanje dotoka..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Dobijeni dotoci sa indeks stranice"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Pokušaj skidanja omota..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Početak skidanja [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Dotoci skinuti na %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Nemoguće skinuti omot: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Skidanje omota sa %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Artikal bez naslova"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Skinuti artikli: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Neuspjelo skidanje artikla: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Grabljenje dotoka"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15828,6 +15885,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr "Ne skidaj CSS liste postavki"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nije pronađen važeći priključak u "
+
 #~ msgid "Options to control the conversion to EPUB"
 #~ msgstr "Opcije za kontroliranje pretvaranja na EPUB"
 
@@ -17190,9 +17250,6 @@ msgstr "Ne skidaj CSS liste postavki"
 #~ msgid "Use &Roman numerals for series number"
 #~ msgstr "Koristi &Rimske brojeve za brojeve serija"
 
-#~ msgid "Toolbar"
-#~ msgstr "Alatna traka"
-
 #~ msgid "Remove a directory from the frequently used directories list"
 #~ msgstr "Ukloni direktorij iz liste često korištenih direktorija"
 
@@ -18973,6 +19030,9 @@ msgstr "Ne skidaj CSS liste postavki"
 #~ msgid " "
 #~ msgstr " "
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Prilagodi traku s alatima"
+
 #~ msgid "misc"
 #~ msgstr "razno"
 
diff --git a/src/calibre/translations/hu.po b/src/calibre/translations/hu.po
index 1a8bd34fdf..bbfb221910 100644
--- a/src/calibre/translations/hu.po
+++ b/src/calibre/translations/hu.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-30 06:19+0000\n"
 "Last-Translator: Roadside <roadside@freemail.hu>\n"
 "Language-Team: Hungarian <hu@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: 2011-03-31 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Semmit nem csinál"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Semmit nem csinál"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Semmit nem csinál"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Semmit nem csinál"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Semmit nem csinál"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Semmit nem csinál"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Semmit nem csinál"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Semmit nem csinál"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Alap"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Testreszabás"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Beállítás nem lehetséges"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Fájltípus"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metaadat olvasó"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metaadat író"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalógus készítő"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Felhasználói felület akciói"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Beállítások"
@@ -333,8 +333,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Hozzáadja/eltávolítja a saját oszlopját a calibre könyv listájában"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Az eszköztár testreszabása"
+msgid "Toolbar"
+msgstr "Eszköztár"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -345,8 +345,8 @@ msgstr ""
 "megváltoztatása"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Keresés testreszabása"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -675,35 +675,31 @@ msgstr "A B&N Nook Color olvasó profilja"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Ez a Sanda Bambook profilbeállítása."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Telepített bővítmények"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "A fájltípus beépülőmodulok leképezése"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Bővítmények testreszabása"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Letiltott bővítmények"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Plugin-ok engedélyezése"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Nem találtam érvényes bővítményt itt: "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "A %s bővítmény indítása a következő hibaüzenettel meghiusult:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -715,17 +711,17 @@ msgstr ""
 "    Igazítsa Calibret saját igényeihez külső pluginok betöltésével.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Bővítmény hozzáadása a ZIP fájl elérési útjának megadásával."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Egy telepített bővítmény eltávolítása név alapján. Nincs hatással a "
 "beépített bővítményekre."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -733,15 +729,15 @@ msgstr ""
 "Bővítmény testreszabása. Adja meg a bővítmény nevét, és a kért beállítást, "
 "vesszővel elválasztva."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "A telepített bővítőmodulok listázása"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "A bővítmény engedélyezése"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "A bővítmény letiltása"
 
@@ -765,106 +761,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Kapcsolódás S60 telefonokhoz"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple eszköz"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "iTunes/iBooks-al kommunikáció"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Apple eszköz felismerve. Indítom az iTunes-t. Kérem, várjon........."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Eszköz metaadat listájának frissítése"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "Kész"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Hírek (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalógus"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Kommunikáció az iTunes-al."
 
@@ -915,20 +923,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Az eszközön lévő könyvek listájának összeállítása..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Könyvek küldése az eszközre..."
 
@@ -936,8 +944,8 @@ msgstr "Könyvek küldése az eszközre..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Könyvek hozzáadása az eszköz metaadat listához..."
 
@@ -947,8 +955,8 @@ msgstr "Könyvek hozzáadása az eszköz metaadat listához..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Könyvek eltávolítása az eszközről"
 
@@ -956,17 +964,17 @@ msgstr "Könyvek eltávolítása az eszközről"
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Könyvek eltávolítása az eszköz metaadat listáról..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Metaadatok küldése az eszközre"
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "A Bambook SDK nincs telepítve."
 
@@ -1267,15 +1275,15 @@ msgstr "Kapcsolódás Sony PRS-500 olvasóhoz."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Kommunikáció az összes Sony eBook olvasóval."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1283,18 +1291,18 @@ msgstr ""
 "Vesszővel tagolt metadaadat mezők gyűjtemények létrehozására az olvasón.  "
 "Lehetőségek: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1303,29 +1311,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1462,7 +1481,7 @@ msgstr "Kiegészítő testreszabás"
 msgid "Communicate with an eBook reader."
 msgstr "Kapcsolódás egy ebook olvasóhoz"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Eszköz-információ lekérdezése"
 
@@ -2223,7 +2242,7 @@ msgstr "Konvertálás HTML formátumba..."
 msgid "Running transforms on ebook..."
 msgstr "Átalakítások futtatatása a könyvön..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Létrehozás"
 
@@ -2376,7 +2395,7 @@ msgstr "Indítás"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Ne szúrja be a Tartalomjegyzéket a könyv elejére."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2387,6 +2406,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2773,105 +2796,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "SABLON HIBA"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Nem"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Igen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Cím"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Szerző(k)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Kiadó"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Megjegyzés"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Címkék"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Sorozatok"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Nyelv"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Dátum"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Kiadás ideje"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Jogok"
 
@@ -3279,7 +3302,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Metaadatok forrása"
 
@@ -3415,7 +3438,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML Tartalomjegyzék generálás beállításai."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3611,6 +3634,7 @@ msgid "Author"
 msgstr "Szerző"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Tárgy"
 
@@ -3929,86 +3953,90 @@ msgstr ""
 "hasznos, ha egyszerű szöveg kimenetű lehetőséggel párosul, mert az egyszerű "
 "szövegből mindig el vannak távolítva a hivatkozások."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "Alapbeállításként a memóriakártyára küldje a belső memória helyett"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Megerősítés törlés előtt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "A főablak méretei"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Figyelmeztetés új verzió esetén."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Római számok használata a könyvsorozatok számozásánál"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Címkelista rendezése név, népszerűség vagy értékelés alapján"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "A borító alapján történő böngészéskor a megjelenített borítók száma"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Az LRF-be való konvertálás alapértelmezett értékei"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "A beépített LRF olvasóprogram beállításai"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "A beépített olvasóprogram által megjelenített formátumok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "A könyvlistában megjelenítendő oszlopok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "A tartalomkiszolgáló automatikus indítása az alkalmazás indulásakor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "A legrégebbi adatbázisban megtartandó hír"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Ikon megjelenítése a tálcán"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Letöltött hírek küldése az eszközre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Könyvek törlése az adatbázisból az eszközre való feltöltés után"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "A borítók megjelenítése külön ablakban a calibre főablaka helyett."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Az alapértelmezett művelet a 'Küldés eszközre' gombra való kattintáskor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4016,7 +4044,7 @@ msgstr ""
 "A keresés elkezdődik, ahogy gépeli a szöveget. Ha ez ki van kapcsolva, akkor "
 "a keresés csak akkor indul el, ha az Enter vagy a Return billentyűt lenyomja."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
@@ -4026,46 +4054,46 @@ msgstr ""
 "kijelzés helyett. A következő találat megjelenítéséhez használja az N vagy "
 "az F3-as billentyűt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "A sorban álló műveletek maximális száma"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Közösségi metaadatok letöltése (címkék, értékelés stb.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Írja felül a szerzőt és a címet az új metaadattal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Borító automatikus letöltése ha lehetséges"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 "A maximális párhuzamosan végrehajtandó műveletek számának korlátozása a "
 "processzorok számára"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Felhasználói felület elrendezése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Mutatssa az átlagos értékeléseket tételenként a címke tallózóban"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Felhasználói felület animációinak tiltása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Válasszon a fájlok közül"
 
@@ -4280,8 +4308,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nincs könyv kiválasztva."
@@ -4486,7 +4514,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4555,7 +4583,7 @@ msgid "Bulk convert"
 msgstr "Csoportos konvertálás"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Nem lehet konvertálni"
 
@@ -4563,7 +4591,7 @@ msgstr "Nem lehet konvertálni"
 msgid "Starting conversion of %d book(s)"
 msgstr "%d könyv konvertálása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "A kimeneti fájl üres, valószínűleg a konverziós folyamat lefagyott."
 
@@ -4752,7 +4780,7 @@ msgid "Stop Content Server"
 msgstr "Tartalomszerver leállítása"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Email küldése"
 
@@ -4760,32 +4788,32 @@ msgstr "Email küldése"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(törlés könyvtárból)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Könyvek e-mail alapú megosztásának beállítása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Küldés eszközre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Kapcsolat/megosztás"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Leállítás"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "Szerver leállítása, ez egy percig is eltarthat, kérjük várj..."
@@ -4876,20 +4904,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "{0} letöltése {1} könyvhöz"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Metaadat nem szerkeszthető"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Nem lehet a könyveket összefűzni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "Legalább két könyvet ki kell választani az egybevonáshoz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -4897,7 +4925,7 @@ msgstr ""
 "Több, mint 5 könyvet jelölt ki összefűzésre. <b>Biztosan</b> végre akarja "
 "hajtani a műveletet?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4909,7 +4937,7 @@ msgstr ""
 "második és az ezután következő kiválasztott könyveket sem törölni, sem "
 "megváltoztatni nem lehet.<br><br>Valóban folytatni szeretné?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4929,7 +4957,7 @@ msgstr ""
 "következő könyvek minden duplikált formátuma véglegesen <b>törlődni</b> fog "
 "a calibre könyvtárából.  <br><br>Valóban folytatni szeretné?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4947,19 +4975,19 @@ msgstr ""
 "duplikált formátuma véglegesen <b>törlődni</b> fog a calibre könyvtárából.  "
 "<br><br>Valóban folytatni szeretné?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Hírek letöltése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Hírek letöltése: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " letöltve"
 
@@ -5024,7 +5052,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Beállítás Varázsló indítása"
 
@@ -5270,7 +5298,7 @@ msgid "The specified directory could not be processed."
 msgstr "A megadott könyvtárt nem lehet használni."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nincsenek könyvek"
 
@@ -5487,8 +5515,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Elérési út"
 
@@ -5498,17 +5526,17 @@ msgstr "Elérési út"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formátumok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Gyűjtemények"
 
@@ -5518,25 +5546,25 @@ msgid "Click to open"
 msgstr "Kattints a megnyitásért"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Nincs"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Borító beillesztése"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Borító másolása"
 
@@ -5594,7 +5622,7 @@ msgstr "kimenet"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5617,14 +5645,14 @@ msgstr "kimenet"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6200,10 +6228,14 @@ msgstr "Ne szúrja be a Tartalomjegyzéket a könyv elejére."
 msgid "FB2 Output"
 msgstr "FB2 kimenet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Részekre osztás"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Betű-átméretezés varázsló"
@@ -6807,7 +6839,7 @@ msgid "Regex:"
 msgstr "Reguláris kifejezés:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Teszt"
 
@@ -7401,21 +7433,21 @@ msgstr "Hiba"
 msgid "Error communicating with device"
 msgstr "Hiba az eszközkapcsolatban"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Nincs megfelelő formátum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Mappa eszközként való megnyitása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Hiba a kapcsolatban"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7423,69 +7455,69 @@ msgstr ""
 "Hiba az eszközkapcsolatban. Válassza le majd csatlakoztassa újra az eszközt "
 "és/vagy indítssa újra az eszközt, esetleg a programot."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Eszköz: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " felismerve"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "kiválasztva küldéshez"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Az eszközre küldendő formátum kiválasztása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Nincs eszköz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Nem tudom küldeni: nincs csatlakoztatott eszköz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Nincs memóriakártya"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Nem tudom küldeni: az eszközben nincs memóriakártya"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Az eszközre való feltöltés előtt automatikusan konvertáljam a kijelölt "
 "könyveket?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Katalógusok küldése az eszközre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Hírek küldése az eszközre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Könyvek küldése az eszközre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7494,11 +7526,11 @@ msgstr ""
 "formátumú változatuk. Konvertálja át a nem megfelelőeket valamelyik, az "
 "eszközöd által támogatott formátumra."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Nincs elég hely az eszközön"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7786,7 +7818,7 @@ msgstr "Formátum kiválasztása"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formátum"
 
@@ -7922,7 +7954,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7969,8 +8001,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8002,12 +8034,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -8202,22 +8234,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Kisbetűk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Nagybetűk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Minden Szó Nagybetűvel Kezdődik"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Nagy kezdőbetűs szavakká alakít"
 
@@ -9728,12 +9760,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9802,7 +9834,7 @@ msgid "Send test mail from %s to:"
 msgstr "Teszt email küldése %s-ról a következőre:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Teszt"
 
@@ -10053,65 +10085,65 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Hírek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Az ebook csatolva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "%s formátumban."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Email küldése:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Az email-ben való elküldés előtt automatikusan konvertáljam a kijelölt "
 "könyveket?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Nem lehet elküldeni a következő könyveket, mert nem léteznek a megadott "
 "formátumokban:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Hírek elküldve:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10125,67 +10157,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Reguláris &kifejezés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Fájlnév:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Cím:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Reguláris kifejezés (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Nincs találat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Szerzők:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Reguláris kifejezés (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Sorozat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Reguláris kifejezés (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Sorszám:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Sorozaton belüli sorszám. Reguláris kifejezés (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Reguláris kifejezés (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10396,48 +10446,48 @@ msgstr ""
 msgid "Edit template"
 msgstr "Sablon szerkesztése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Az eszközön"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Méret (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "A keresési név \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "%s. rész - %s sorozat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Duplakattintás a <b>szerkesztéshez</b><br><br>"
 
@@ -10514,7 +10564,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Nincs találat</b> a keresett kifejezésre: <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Nincs találat"
 
@@ -10531,12 +10581,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF olvasó eszköztár"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Következõ oldal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Előző oldal"
 
@@ -11361,20 +11411,27 @@ msgstr "Legyen alapértelmezett"
 msgid "&Remove email"
 msgstr "Email eltávolítása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Auto küld"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 "Emailben elkündendő formátum. Az első létező formátum kerül elküldésre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11383,7 +11440,7 @@ msgstr ""
 "küldve emailben erre a címre (ha létezik a 'Formátumok' oszlopban beírtaknak "
 "megfelelő)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "új email cím"
 
@@ -11395,94 +11452,94 @@ msgstr "Keskeny"
 msgid "Wide"
 msgstr "Széles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Közepes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Kicsi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Nagy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Mindig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Soha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Első betű szerint"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Letiltva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Felhasználói felület elrendezése (újraindítás szükséges)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "Megjelenített borítók száma böngészéskor (borító böngészés üzemmódban, "
 "újraindítást igényel)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Nyelv kiválasztása (újraindítás szükséges):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Értékelések átlagának megjelenítése a cimkeböngészőben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr "Minden animáció letiltása. Hasznos funkció lassú/régi gépek esetén."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Animációk tiltása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Ikon megjelenítése a tálcán (újraindítás szükséges)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Üdvözlő képernyő indításkor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Értesítések letiltása az értesítési területen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Római számok használata a könyvsorozatoknál"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "A borító alapján történő keresés külön ablakba (újraindítás szükséges)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr "Cimkeböngésző kategóriák és felosztási eljárás:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11491,22 +11548,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr "Összezárás, ha az elemek száma több, mint:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11516,64 +11573,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Eszköztár"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Ikonméret:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Feliratok az ikonok alatt:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "Az eszköztár szétválasztása két eszköztárrá"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Betűtípus:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Betűtípus cseréje (újraindítás szükséges)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Alkalmaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Alapértelmezett beállítások visszaállítása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Változások elvetése és visszatérés a főmenübe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -12339,30 +12392,34 @@ msgid "The main toolbar"
 msgstr "A fő eszköztárban"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "A fő eszköztárban, ha egy eszköz csatlakozott"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "A könyvek helyi menüjében, a calibre könyvtárában"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "A könyvek helyi menüjében, az eszközön"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12461,7 +12518,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Keresés"
@@ -12554,167 +12611,167 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "%s átnevezése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "%s keresése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "A(z) %s kivételével mindent keressen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "A(z) %s kategória elrejtése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Könyvek keresése a(z) %s kategóriában"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "Ne keressen könyveket a(z) %s kategóriában"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "A(z) %s kezelése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Elmentett keresések kezelése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Felhasználói kategóriák kezelése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Minden kategória megjelenítése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Az alketegória séma megváltoztatása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Sok könyv metaadatának megváltoztatása hosszú ideig is eltarthat. Folytatja?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Keresés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr "Felhasználói kategória átnevezése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr "A(z) %s név már használatban van"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr "Új kategória"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr "Felhasználói kategória törlése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr "A8z) %s nem egy felhasználói kategória"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr "A(z) %s elemeket tartalmaz. Valóban törölni akarja?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr "Kategória eltávolítása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr "A(z) %s felhasználói kategória nem létezik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr "Hozzáadás felhasználói kategóriához"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr "A(z) %s felhasználói kategória nem létezik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Elemek keresése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12724,62 +12781,62 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "&Keres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Az első/következő elem keresése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "A kategóriák összecsukása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "Nincs több találat.</b><p> Kattintson a keresésre újra az első találathoz "
 "ugráshoz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Rendezés név szerint"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Rendezés népszerűség szering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Rendezés átlagos értékelés szerint"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Minden fetétel teljesül"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Bármelyik feltétel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "&Felhasználói kategóriák kezelése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Hozzén létre saját kategóriákat a Cimke Böngészőben"
 
@@ -12857,23 +12914,23 @@ msgstr ""
 "hibanapló elérhető a következő helyen: %s<p>A hibanapló automatikusan "
 "megjelenik."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Konvertálási hiba"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Címzett tiltása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Nem sikerült</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Folyamatban van néhány művelet végrehajtása. Megszakítja?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -12883,11 +12940,11 @@ msgstr ""
 "                      A kilépés adatvesztést okozhat az eszközön.<br>\n"
 "                      Biztos, hogy ki akarsz lépni??"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Folyamatban lévő műveletek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13095,7 +13152,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Ebook olvasó beállítása"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Az utoljára használt ablakméret megjegyzése"
 
@@ -13175,36 +13232,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "Keresés szótárban"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Ugrás..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -13282,75 +13339,75 @@ msgstr "Nyomtatási kép"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Kapcsolódás a dict.org-hoz, hogy keressük: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Ebook választás"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Ebook-ok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Nincs találat a következőhöz: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Folyamatban..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "%s létrehozása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Könyvjelző hozzáadása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Könyvjelző nevének megadása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Könyvjelzők kezelése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Ebook betöltése..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Nem lehet megnyitni a könyvet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Az ebook olvasó program beállításai"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Ha be van állítva, akkor az olvasóprogram megpróbál az előtérbe kerülni "
 "induláskor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Javascript és konzolüzenetek megjelenítése a konzolon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13428,27 +13485,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr "eBook nyomtatása"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Kisbetű - nagybetű váltás"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Kisbetű - nagybetű váltás"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14694,11 +14751,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14712,15 +14769,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Régi adatbázis áthozatala a jelenlegibe: %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Másolás: <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Adatbázis tömörítése"
 
@@ -15780,101 +15837,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Ismeretlen Hírforrás"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "A letöltés befejeződött"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "A következő cikkek letöltése nem sikerült:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "A következő cikkek részeinek letöltése nem sikerült:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tHibás linkek:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "Nem lehet cikket letölteni."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Hírek letöltése..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Hírek letöltve az index oldalról"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Borító letöltése..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Letöltés megkezdve [%d szálon]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Hírek letöltve: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Nem lehet borítót letölteni: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Borító letöltése a következő helyről: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Névtelen Cikk"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Cikk letöltve: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "A következő cikk letöltése nem sikerült: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Hír letöltése"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16141,6 +16198,9 @@ msgstr "Ne töltse le a CSS stíluslapokat."
 #~ msgid "Options to control the conversion to EPUB"
 #~ msgstr "EPUB formátumba konvertálás beállításai"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nem találtam érvényes bővítményt itt: "
+
 #~ msgid "Print generated OPF file to stdout"
 #~ msgstr "Írja ki a generált OPF fájl tartalmát"
 
@@ -17109,9 +17169,6 @@ msgstr "Ne töltse le a CSS stíluslapokat."
 #~ msgid "Communicate with the Cybook eBook reader."
 #~ msgstr "Kapcsolódás Cybook olvasóhoz."
 
-#~ msgid "Toolbar"
-#~ msgstr "Eszköztár"
-
 #~ msgid "Show &text in toolbar buttons"
 #~ msgstr "Gombfeliratok mutatása az eszköztárban"
 
@@ -18131,6 +18188,9 @@ msgstr "Ne töltse le a CSS stíluslapokat."
 #~ msgid "Switch to library..."
 #~ msgstr "Adatbázis váltás..."
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Az eszköztár testreszabása"
+
 #~ msgid "Communicate with the Booq Avant"
 #~ msgstr "Kommunikáció a Booq Avant-al"
 
@@ -18174,6 +18234,9 @@ msgstr "Ne töltse le a CSS stíluslapokat."
 #~ "értékekre. Azt hogy hogyan generálja Beállítások->Haladó->Finom beállíások "
 #~ "menüpontban kontrollálhatók."
 
+#~ msgid "Customize searching"
+#~ msgstr "Keresés testreszabása"
+
 #~ msgid "ascii/LaTeX"
 #~ msgstr "ascii/LaTeX"
 
@@ -18194,3 +18257,6 @@ msgstr "Ne töltse le a CSS stíluslapokat."
 
 #~ msgid "backslashreplace"
 #~ msgstr "Visszaperjel cseréje"
+
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "Az eszköztár szétválasztása két eszköztárrá"
diff --git a/src/calibre/translations/id.po b/src/calibre/translations/id.po
index 2badfb3da3..6840b54db1 100644
--- a/src/calibre/translations/id.po
+++ b/src/calibre/translations/id.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-01-31 19:51+0000\n"
-"Last-Translator: Santoso Wijaya <Unknown>\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-06 16:58+0000\n"
+"Last-Translator: Aryo Sanjaya <Unknown>\n"
 "Language-Team: Indonesian <id@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: 2011-03-27 04:42+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-07 04:34+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -169,51 +169,51 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:46
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:54
 msgid "Unknown"
-msgstr "Tidak Dikenal"
+msgstr "Tidak Diketahui"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Dasar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Sesuaikan"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
-msgstr ""
+msgstr "Tidak dapat mengkonfigurasi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Jenis file"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Pembaca metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Penulis metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Pembuat katalog"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Aksi Antar Muka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
-msgstr "Preferensi"
+msgstr "Pengaturan"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:18
 msgid ""
@@ -221,9 +221,9 @@ msgid ""
 "linked files. This plugin is run every time you add an HTML file to the "
 "library."
 msgstr ""
-"Ikuti semua link local di dalam file HTML dan membuat ZIP file yang berisi "
-"semua file yang ditunjuk oleh link-link tersebut. Plugin ini akan dijalankan "
-"setiap kali sebuah file HTML dimasukan di dalam library."
+"Ikuti semua link lokal dalam file HTML kemudian buat file ZIP berisi semua "
+"file yang terkait tersebut. Plugin ini dijalankan setiap kali anda "
+"menambahkan file HTML ke library."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:54
 msgid ""
@@ -330,8 +330,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Konfigurasikan toolbar"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -652,35 +652,31 @@ msgstr "Profil ini adalah untuk B&N Nook Color"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Profil ini adalah untuk Sanda Bambook"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Plugin terinstal"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Plugin non-aktif"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Plugin aktif"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -688,29 +684,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -732,106 +728,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -875,20 +883,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -896,8 +904,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -907,8 +915,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -916,17 +924,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1225,32 +1233,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1259,29 +1267,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1414,7 +1433,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2051,7 +2070,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2166,7 +2185,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2177,6 +2196,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2526,105 +2549,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3007,7 +3030,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3140,7 +3163,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3306,6 +3329,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3570,135 +3594,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3906,8 +3934,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4104,7 +4132,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4170,7 +4198,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4178,7 +4206,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4359,7 +4387,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4367,32 +4395,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4479,26 +4507,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4506,7 +4534,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4518,7 +4546,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4529,19 +4557,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4606,7 +4634,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4848,7 +4876,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5050,8 +5078,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5061,17 +5089,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5081,25 +5109,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5157,7 +5185,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5180,14 +5208,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5752,10 +5780,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6347,7 +6379,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6932,97 +6964,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7308,7 +7340,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7444,7 +7476,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7491,8 +7523,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7524,12 +7556,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7713,22 +7745,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9208,12 +9240,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9282,7 +9314,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9517,61 +9549,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9585,67 +9617,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9853,48 +9903,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9969,7 +10019,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9986,12 +10036,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10797,25 +10847,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10827,91 +10884,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10920,22 +10977,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10945,64 +11002,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11733,30 +11786,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11853,7 +11910,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11946,166 +12003,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12115,60 +12172,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12241,34 +12298,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12468,7 +12525,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12546,36 +12603,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12651,73 +12708,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12792,27 +12849,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13978,11 +14035,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13996,15 +14053,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15041,101 +15098,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15247,3 +15304,6 @@ msgstr ""
 
 #~ msgid " "
 #~ msgstr " "
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Konfigurasikan toolbar"
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index 7ea604be0b..85aff09a57 100644
--- a/src/calibre/translations/it.po
+++ b/src/calibre/translations/it.po
@@ -8,23 +8,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre_calibre-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-02-27 23:05+0000\n"
 "Last-Translator: Andrea Marenghi <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: 2011-03-27 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,1105,-1,1312,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Non fa assolutamente niente"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -35,7 +35,7 @@ msgstr "Non fa assolutamente niente"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -52,9 +52,9 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -74,7 +74,7 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -120,19 +120,19 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -140,12 +140,12 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -156,11 +156,11 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -174,46 +174,46 @@ msgstr "Non fa assolutamente niente"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personalizzazione"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Impossibile configurare"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tipo di file"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Lettore metadati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Scrittore metadati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generatore del catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Azioni interfaccia utente"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferenze"
@@ -340,8 +340,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Aggiunge/Rimuove colonne personalizzate dalla lista dei libri"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Personalizza la barra degli strumenti"
+msgid "Toolbar"
+msgstr "Barra degli strumenti"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -352,8 +352,8 @@ msgstr ""
 "azioni disponibili in ognuno"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Personalizzazione ricerche"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -694,35 +694,31 @@ msgstr "Questo profilo è pensato per il B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Questo profilo è riservato a Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Plugin installati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Plugin per mapping dei tipi di file"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Personalizzazione dei plugin locali"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Plugin disabilitati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Plugin attivati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Nessun plugin valido trovato in "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -734,17 +730,17 @@ msgstr ""
 "    Personalizza Calibre con l'utilizzo di plugin esterni\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Aggiunge un plugin specificando il percorso al file zip che lo contiene."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Rimuove un plugin scelto per nome. Non ha effetto sui plugin di sistema"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -752,15 +748,15 @@ msgstr ""
 "Personalizza un plugin. Specificare il nome del plugin e la stringa di "
 "personalizzazione separati da una virgola."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Elenca tutti i plugin installati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Abilita il plugin nominato"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Disabilita il plugin nominato"
 
@@ -784,43 +780,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunica con i telefoni S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Usa le serie come categoria per iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Conserva le copertine da iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Dispositivo Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Comunica con iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Dispositivo Apple individuato, avvio di iTunes, attendere prego ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -829,27 +837,27 @@ msgstr ""
 "biblioteca iTunes al desktop, quindi aggiungerli alla finestra della "
 "biblioteca calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Aggiornamento dei metadati sul dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d di %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "completato"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -859,7 +867,7 @@ msgstr ""
 "Eliminarli utilizzando l'app iBooks.\n"
 "Fare clic su 'Mostra dettagli' per una lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -867,31 +875,31 @@ msgstr ""
 "Alcune copertine non possono essere convertite.\n"
 "Fare clic su 'Mostra dettagli' per una lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Notizie"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Comunica con iTunes."
 
@@ -943,20 +951,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Recupero della lista dei libri sul dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Trasferimento dei libri nel dispositivo..."
 
@@ -964,8 +972,8 @@ msgstr "Trasferimento dei libri nel dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Aggiunta dei libri alla lista metadati del dispositivo..."
 
@@ -975,8 +983,8 @@ msgstr "Aggiunta dei libri alla lista metadati del dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Rimozione dei libri dal dispositivo..."
 
@@ -984,17 +992,17 @@ msgstr "Rimozione dei libri dal dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Cancellazione libri dalla lista metadati del dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Invio dei metadati al dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook"
 
@@ -1309,15 +1317,15 @@ msgstr "Comunica con il lettore Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunica con tutti i lettori Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Tutti per titolo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Tutti per autore"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1325,7 +1333,7 @@ msgstr ""
 "Lista di metadati separati da virgole da convertire in collezioni sul "
 "dispositivo. Le possibilità sono: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1335,11 +1343,11 @@ msgstr ""
 "valori alla lista per abilitarle. Alle collezioni verrà dato il nome "
 "specificato dopo il carattere \":\"."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Invia copertine aggiuntive al lettore (per lettori recenti)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1354,14 +1362,14 @@ msgstr ""
 "dovrebbe essere usata solo con i nuovi modelli SONY: 350, 650, 950 e più "
 "recenti."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Aggiorna le copertine aggiuntive se la gestione automatica è abilitata (per "
 "lettori recenti)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1371,13 +1379,13 @@ msgstr ""
 "che collegate il lettore. Deselezionare l'opzione se avete tanti libri sul "
 "lettore da rendere le performance inaccettabili"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 "Conserva le corrette proporzioni della copertina in fase di generazione "
 "delle miniatura"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1388,6 +1396,17 @@ msgstr ""
 "l'opzione se si desidera che le miniature siano di grandezza massima, "
 "tralasciando le corrette proporzioni."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1524,7 +1543,7 @@ msgstr "Ulteriori personalizzazioni"
 msgid "Communicate with an eBook reader."
 msgstr "Comunica con un lettore di eBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Recupero informazioni del dispositivo..."
 
@@ -2358,7 +2377,7 @@ msgstr "Conversione dell'input in HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Transcodifica di un ebook in corso..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Creazione in corso"
 
@@ -2517,7 +2536,7 @@ msgstr "Avvio"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Non inserire un indice all'inizio del libro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2535,6 +2554,10 @@ msgstr ""
 "della struttura\" e/o \"Indice\" (abilitare l'opzione \"Forza l'uso "
 "dell'indice generato automaticamente\")"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2946,105 +2969,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "ERRORE TEMPLATE"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "No"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Sì"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Titolo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autori"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Editore"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produttore"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Commenti"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Tag"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Lingua"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Pubblicato"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Privilegi"
 
@@ -3487,7 +3510,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Sorgente metadati"
 
@@ -3626,7 +3649,7 @@ msgid "HTML TOC generation options."
 msgstr "Opzioni per creazione della TOC (indice contenuti) da HTML"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3835,6 +3858,7 @@ msgid "Author"
 msgstr "Autore"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Soggetto"
 
@@ -4196,76 +4220,80 @@ msgstr ""
 "testo diversa da \"plain\". L'uso dell'opzione \"plain\" rimuove sempre i "
 "link dai documenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Invia il file alla scheda di memoria invece che alla memoria principale come "
 "impostazione predefinita"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Chiedi conferma prima di eliminare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Geometria della finestra principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Avverti quando è disponibile una nuova versione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Usa numeri romani per i numeri delle serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Ordina i tag per nome, popolarità o valutazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Numero di copertine da visualizzare nella modalità di sfogliatura copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Parametri predefiniti per la conversione in LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opzioni del lettore di libri LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formati visualizzati utilizzando il lettore interno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Colonne da mostrare nella lista dei libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Avvia automaticamente il server dei contenuti quando si apre l'applicazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Notizie più vecchie da mantenere nel database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Mostra l'icona nell'area di notifica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Invia le notizie scaricate al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 "Elimina i libri dalla biblioteca dopo averli caricati sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4273,17 +4301,17 @@ msgstr ""
 "Visualizza le copertine in una finestra separata invece che nella finestra "
 "principale di calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Disabilita messaggi dall'icona nella area di notifica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Azione predefinita da eseguire quando viene cliccato il pulsante di invio al "
 "dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4291,51 +4319,51 @@ msgstr ""
 "Inizia a cercare mentre scrivi. Se questa opzione è disabilitata, la ricerca "
 "inizierà solo dopo aver premuto Return o Enter."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Numero massimo di lavori in attesa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Scarica metadati sociali (tag/valutazioni/etc.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Usa i nuovi metadati per cambiare l'autore e il titolo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Scarica automaticamente la copertina, se disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Limita il massimo numero di lavori simultanei al numero delle CPU."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "L'aspetto dell'interfaccia grafica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Visualizza la valutazione media per elemento nel browser dei tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Disattiva animazioni interfaccia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "categorie del browser di tag da non visualizzare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Seleziona documenti"
 
@@ -4553,8 +4581,8 @@ msgstr "Annotazioni utente generate solo dalla biblioteca principale"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nessun libro selezionato"
@@ -4759,7 +4787,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4832,7 +4860,7 @@ msgid "Bulk convert"
 msgstr "Converti in gruppo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Impossibile convertire"
 
@@ -4840,7 +4868,7 @@ msgstr "Impossibile convertire"
 msgid "Starting conversion of %d book(s)"
 msgstr "Conversione di %d libri avviata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "File di output vuoto, probabilmente il processo di conversione è fallito"
@@ -5032,7 +5060,7 @@ msgid "Stop Content Server"
 msgstr "Ferma server di contenuti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Invia messaggio elettronico a"
 
@@ -5040,32 +5068,32 @@ msgstr "Invia messaggio elettronico a"
 msgid "Email to and delete from library"
 msgstr "Spedisci per email e cancella dalla libreria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(cancella dalla libreria)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Imposta condivisione di libri basata su email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Invia al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Connetti/condividi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "In arresto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "Server in arresto. Attendere: potrebbe richiedere qualche minuto."
@@ -5153,26 +5181,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Scaricamento {0} per {1} libri"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Impossibile modificare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Impossibile unire i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5184,7 +5212,7 @@ msgstr ""
 "sarà modificato.<br><br> I libri successivi non saranno cancellati o "
 "modificati.<br><br>Conferma per procedere."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5196,7 +5224,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5207,19 +5235,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Scarica notizie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Recupero notizie da "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " preso."
 
@@ -5284,7 +5312,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Avvia l'assistente di configurazione iniziale"
 
@@ -5535,7 +5563,7 @@ msgid "The specified directory could not be processed."
 msgstr "Impossibile elaborare la cartella indicata."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nessun libro."
 
@@ -5755,8 +5783,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Percorso"
 
@@ -5766,17 +5794,17 @@ msgstr "Percorso"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Raccolte"
 
@@ -5786,25 +5814,25 @@ msgid "Click to open"
 msgstr "Fare clic per aprire"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Nessuno"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5862,7 +5890,7 @@ msgstr "output"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5885,14 +5913,14 @@ msgstr "output"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6477,10 +6505,14 @@ msgstr "Non inserire un &indice all'inizio del libro."
 msgid "FB2 Output"
 msgstr "Output FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Seziona:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Assistente per ingradimento degli stili di caratteri"
@@ -7099,7 +7131,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7706,21 +7738,21 @@ msgstr "Errore"
 msgid "Error communicating with device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Nessun formato adatto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Selezionare la cartella da aprire come dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7728,68 +7760,68 @@ 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " individuato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /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:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Selezionare il formato da inviare al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Nessun dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Impossibile inviare: nessun dispositivo connesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Nessuna scheda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Inviando i cataloghi al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Invio delle notizie al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Invio dei libri al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7798,11 +7830,11 @@ msgstr ""
 "trovato un formato adeguato. È prima necessario convertire i libri in un "
 "formato supportato dal dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Spazio sul dispositivo insufficiente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -8107,7 +8139,7 @@ msgstr "Scegliere il formato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formato"
 
@@ -8247,7 +8279,7 @@ msgstr "&Ok"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Annulla"
 
@@ -8296,8 +8328,8 @@ msgid "Location"
 msgstr "Posizione"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8329,12 +8361,12 @@ msgid "Author sort"
 msgstr "Ordinamento per autore"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Nome dell'autore non valido"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "I nomi degli autori non possono contenere caratteri &."
 
@@ -8530,22 +8562,22 @@ msgid "Working"
 msgstr "In esecuzione"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Minuscole"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Maiuscole"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Caratteri per titolo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Iniziali maiuscole"
 
@@ -10107,12 +10139,12 @@ msgid "%s (was %s)"
 msgstr "%s (era %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "L'elemento è vuoto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 "Un elemento non può essere impostato a niente. Cancellarlo piuttosto."
@@ -10184,7 +10216,7 @@ msgid "Send test mail from %s to:"
 msgstr "Invia un messaggio di prova da %s a:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -10429,65 +10461,65 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Invia %s come email a %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Notizie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "Libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Troverete allegato il libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "di"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "nel formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Spedizione di un messaggio elettronico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 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/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Impossibile inviare i libri seguenti via email poiché non sono stati trovati "
 "formati adatti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Spedizione email del libro non riuscita"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "inviato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Notizie inviate a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10501,67 +10533,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "&Espressione regolare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Nome file:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Titolo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Espressione regolare (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Espressione regolare (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Serie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Espressione regolare (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Indice serie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Espressione regolare (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Espressione regolare (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Browser delle copertine"
@@ -10773,48 +10823,48 @@ msgstr "S"
 msgid "Edit template"
 msgstr "Modifica modello"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Dimensione (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Libro %s di %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "La parola chiave è \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "Lo UUID di questi libri è \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "Nella biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Dimensione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Marcato per l'eliminazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doppio clic per <b>modificarmi</b><br><br>"
 
@@ -10891,7 +10941,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Nessuna corrispondenza</b> trovata per la frase <i>%s</i>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Nessuna corrispondenza trovata"
 
@@ -10908,12 +10958,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Barra degli strumenti visualizzatore LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Pagina successiva"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Pagina precedente"
 
@@ -11768,19 +11818,26 @@ msgstr "Crea &default"
 msgid "&Remove email"
 msgstr "&Elimina email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Invio automatico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formati per email. Verrà inviato il primo formato compatibile."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11789,7 +11846,7 @@ msgstr ""
 "questo indirizzo di posta elettronica (presupposto che ce ne sia uno "
 "indicato nella lista delle opzioni)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "nuovo indirizzo di posta elettronica."
 
@@ -11801,92 +11858,92 @@ msgstr "Stretto"
 msgid "Wide"
 msgstr "Largo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Media"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Piccola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Sempre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Mai"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Partizionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "&Aspetto interfaccia grafica (richiede riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Ling&ua (richiede riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 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/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 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/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Disattiva le &animazioni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Visualizza l'&icona nell'area di notifica (richiede riavvio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Visualizza lo &splash screen all'avvio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Disattiva &notifiche nell'area di notifica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Usa numeri &romani per le serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Visualizza le &copertine in una finestra separata (richiede riavvio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11895,22 +11952,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11920,52 +11977,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Barra degli Strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Dimensione &icone:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Mostra &testo sotto le icone:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Dividi la barra degli strumenti in due barre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Applica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Ripristina &predefiniti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Salva modifiche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Annulla e torna al quadro generale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Ripristino predefiniti non supportato per"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11973,7 +12026,7 @@ msgstr ""
 "Alcune modifiche effettuate richiedono il riavvio. Riavviare calibre il "
 "prima possibile."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11981,7 +12034,7 @@ msgstr ""
 "Le modifiche effettuate richiedono il riavvio immediato di calibre. Non è "
 "possibile fare altre modifiche finché non si riavvia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Riavvio richiesto"
@@ -12761,30 +12814,34 @@ msgid "The main toolbar"
 msgstr "La barra degli strumenti principale"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "La barra degli strumenti principale quando un dispositivo è connesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Il menu contestuale per i libri nella biblioteca calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Il menu contestuale per i libri sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Impossibile aggiungere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Impossibile aggiungere le azioni %s a questa posizione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Impossibile rimuovere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Impossibile rimuovere le azioni %s da questa posizione"
 
@@ -12883,7 +12940,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Cerca"
@@ -12977,170 +13034,170 @@ msgstr "Clicca per cambiare"
 msgid "&Alternate shortcut:"
 msgstr "Scorciatoia &alternativa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Nascondi categoria %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Visualizza categoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Gestione %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Gestione ricerche salvate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Gestione categorie utente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Visualizza tutte le categorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Modificare gli autori di molti libri può durare un tempo abbastanza lungo. "
 "Sei sicuro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Modificare i metadata per tanti libri può durare un tempo abbastanza lungo. "
 "Sei sicuro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Ricerche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Duplica parola chiave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "Il nome della ricerca salvata %s è già in uso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Cerca elemento nel browser dei tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13150,62 +13207,62 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "&Cerca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Trova il primo/prossimo elemento corrispondente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Contrai tutte le categorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Ordina per nome"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Ordina per popolarità"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Ordina per valutazione media"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 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:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Fai corrispondere tutti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Fai corrispondere uno qualsiasi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Gestione categorie &utente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Aggiungi categorie personalizzate al browser dei tag"
 
@@ -13282,23 +13339,23 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Ricetta deattivata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Operazione Fallita</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13309,11 +13366,11 @@ msgstr ""
 "sul dispositivo.<br>\n"
 "                      Interrompere comunque?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13520,7 +13577,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opzioni per personalizzare il lettore di libri"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Ricorda la dimensione della finestra usata l'ultima volta"
 
@@ -13602,36 +13659,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "Cerca nel dizionario  (&L)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Vai a..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Sezione successiva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Sezione precedente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Inizio documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Fine documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Inizio sezione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Fine sezione"
 
@@ -13709,78 +13766,78 @@ msgstr "Anteprima di stampa"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Sto collegano a dict.org per cercare: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Scelta libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Nessuna corrispondenza trovata per %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Caricamento..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Impaginazione %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Segnalibro #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Aggiungi segnalibro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Inserire il titolo per il segnalibro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Gestire i segnalibri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Caricamento libro..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Impossibile aprire il libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opzioni per controllare il visualizzatore di libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Se specificato, la finestra di visualizzazione tenterà di apparire in primo "
 "piano quando avviata."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Se selezionato, all'avvio la finestra del viewer si aprirà a pieno schermo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 "Scrivi avvertenze dall'esecuzione e messaggi dal quadro di comando nella "
 "finestra del quadro di comando."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13858,27 +13915,27 @@ msgstr "Trova occorrenza precedente"
 msgid "Print eBook"
 msgstr "Stampa del libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Modificare capitalizzazioned dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Inverti capitalizzazione dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Trasinare per ridimensionare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Visualizza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Nascondi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Attiva/Disattiva"
 
@@ -15265,11 +15322,11 @@ msgstr ""
 "\n"
 "Per aiuto su un comando particolare: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Nessuna etichetta fornita"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15285,16 +15342,16 @@ msgstr "%sLa valutazione media è %3.1f"
 msgid "Main"
 msgstr "Principale"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Migrazione del vecchio database nella biblioteca in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Sto copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Compattazione database"
 
@@ -16385,95 +16442,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Sorgente di notizie sconosciuta"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Scaricamento completato"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Scaricamento dei seguenti articoli fallito:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " da "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tLink falliti:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Scaricamento feed..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Ricevuti feed dalla pagina principale"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Tentativo di scaricamento della copertina..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Preparazione dell'immagine principale in corso"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Inizio scaricamento [%d articoli]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Feed scaricati in %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Impossibile scaricare la copertina: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Scaricamento copertina da %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Immagine principale scaricata"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Articolo senza titolo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Articolo scaricato: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Scaricamento fallito dell'articolo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Scaricamento feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16481,7 +16538,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17454,9 +17511,6 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "Forza un'interruzione di pagina prima dei tag i cui nomi corrispondono a "
 #~ "questa espressione regolare"
 
-#~ msgid "Toolbar"
-#~ msgstr "Barra degli strumenti"
-
 #~ msgid ""
 #~ "No metadata found, try adjusting the title and author or the ISBN key."
 #~ msgstr ""
@@ -19722,6 +19776,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "Tags to apply when adding a book:"
 #~ msgstr "Tag da applicare quando viene aggiunto un libro:"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Personalizza la barra degli strumenti"
+
 #~ msgid "Read metadata from &file contents rather than file name"
 #~ msgstr "Leggi metadati dal contenuto del &file piuttosto che dal suo nome"
 
@@ -19733,6 +19790,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "cambiare il comportamento di calibre. Le modifiche avranno effetto solo dopo "
 #~ "il riavvio di calibre."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nessun plugin valido trovato in "
+
 #~ msgid ""
 #~ "Note: <b>you can destroy your library</b> using this feature. Changes are "
 #~ "permanent. There is no undo function. You are strongly encouraged to back up "
@@ -19742,6 +19802,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "cambiamenti sono permanenti. Non darà possibile la funzione annulla. E' "
 #~ "molto raccomandabile eseguire il backup della libreria prima di procedere."
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Dividi la barra degli strumenti in due barre"
+
 #~ msgid ""
 #~ "Scale used to determine the length at which a line should be unwrapped if "
 #~ "preprocess is enabled. Valid values are a decimal between 0 and 1. The "
@@ -20051,3 +20114,6 @@ msgstr "Non scaricare i fogli di stile CSS"
 
 #~ msgid "Plugin {0} successfully removed"
 #~ msgstr "Plugin {0} rimosso con successo"
+
+#~ msgid "Customize searching"
+#~ msgstr "Personalizzazione ricerche"
diff --git a/src/calibre/translations/ja.po b/src/calibre/translations/ja.po
index c60db59fa5..96e72f44b3 100644
--- a/src/calibre/translations/ja.po
+++ b/src/calibre/translations/ja.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2010-12-16 23:11+0000\n"
-"Last-Translator: Hiroshi Miura <miurahr@linux.com>\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-01 14:23+0000\n"
+"Last-Translator: okano <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2011-03-27 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "まったく何もしません。（何も影響しません。）"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "まったく何もしません。（何も影響しません。）"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "まったく何もしません。（何も影響しません。）"
 msgid "Unknown"
 msgstr "不明"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "基礎"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "設定できない"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "ファイル形式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "メタデータ読み込み"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "書誌情報書き出し"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "カタログ・ジェネレータ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "ユーザインターフェースアクション"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "基本設定"
@@ -329,8 +329,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "calibre書籍リストに表示列を追加/削除する"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "ツールバーのカスタマイズ"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -339,7 +339,7 @@ msgid ""
 msgstr "ツールバーや、各々実行できるメニューが表示されるコンテキストメニューをカスタマイズする。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -651,35 +651,31 @@ msgstr "このプロファイル設定は、バーンズアンドノーブルの
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "インストール済みのプラグイン"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "filetypeプラグインをマッピングする"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "ローカルのプラグインのカスタマイズ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "無効なプラグイン"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "有効なプラグイン"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "有効なプラグインが見つかりませんでした: "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "プラグイン%sの初期化に失敗してトレースバック"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -687,29 +683,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "カスタムのプラグインを名前によって取り除きます。ビルトインのプラグインには影響はありません。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "プラグインをカスタマイズします。プラグインの名前とカスタマイズした文字列は、コンマで区切って指定します。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "インストールされたプラグインを一覧表示"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "名付けたプラグインを有効にする"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "名付けたプラグインを無効にする"
 
@@ -731,69 +727,81 @@ msgstr "電子書籍を送るためのデバイス上のディレクトリ名。
 msgid "Communicate with S60 phones."
 msgstr "電話機 S60 と通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
-msgstr "iTunes/iBooksのカテゴリーをシリーズとして使う"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr "iTunes/iBooksから表紙を保存"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr "iTunes/iBooksのカテゴリーをシリーズとして使う"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr "iTunes/iBooksから表紙を保存"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "iTunes/iBooksと通信"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "デバイスの書誌情報リストを更新..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "完了"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -803,37 +811,37 @@ msgstr ""
 "iBooksアプリを使って削除してください。\n"
 "'詳細を見る'をクリックするとリストを表示します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "ニュース"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "カタログ"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "iTunesと通信"
 
@@ -877,20 +885,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "デバイス内の書籍リストを取得しています..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "デバイスに書籍を転送しています..."
 
@@ -898,8 +906,8 @@ msgstr "デバイスに書籍を転送しています..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "書籍をデバイスの書誌情報リストへ追加中..."
 
@@ -909,8 +917,8 @@ msgstr "書籍をデバイスの書誌情報リストへ追加中..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "デバイスから書籍を削除しています..."
 
@@ -918,17 +926,17 @@ msgstr "デバイスから書籍を削除しています..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "デバイスの書誌情報リストから書籍を削除..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "デバイスにメタデータを送信しています..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1227,32 +1235,32 @@ msgstr "Sony PRS-500 電子書籍リーダ─と通信します。"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Sony eBookリーダーと通信"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr "書誌情報のCSVファイルの項目をデバイスのコレクションに変換します。取りこめる可能性は： "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1261,29 +1269,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1416,7 +1435,7 @@ msgstr "拡張カスタマイズ"
 msgid "Communicate with an eBook reader."
 msgstr "電子書籍リーダ─と通信します。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "デバイス情報を取得..."
 
@@ -2063,7 +2082,7 @@ msgstr "入力をHTMLに変換中..."
 msgid "Running transforms on ebook..."
 msgstr "電子書籍の変換中..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "作成"
 
@@ -2178,7 +2197,7 @@ msgstr "開始"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2189,6 +2208,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2541,105 +2564,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "No"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Yes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "書籍名"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "著者"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "発行者"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "プロデューサ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "コメント"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "タグ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "シリーズ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "言語"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "日付印"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "発行日"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "権利"
 
@@ -3022,7 +3045,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3155,7 +3178,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML 目次生成オプション"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3321,6 +3344,7 @@ msgid "Author"
 msgstr "著者"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "サブジェクト"
 
@@ -3585,135 +3609,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "削除前に確認"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "主ウインドーの大きさ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "システムトレーにアイコンを表示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "ダウンロードしたニュースをデバイスにアップロード"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "新しい書誌情報に、著者とタイトルを上書きする。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "最大同時処理数をCPUの数に制限する。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "ファイル選択"
 
@@ -3921,8 +3949,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "本が選択されていません"
@@ -4119,7 +4147,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4185,7 +4213,7 @@ msgid "Bulk convert"
 msgstr "まとめて変換"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "変換できない"
 
@@ -4193,7 +4221,7 @@ msgstr "変換できない"
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4374,7 +4402,7 @@ msgid "Stop Content Server"
 msgstr "コンテンツサーバを停止"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "電子メールする"
 
@@ -4382,32 +4410,32 @@ msgstr "電子メールする"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "電子メールでの書籍の共有を設定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "デバイスに送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "接続/共有"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4494,26 +4522,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "メタデータを編集できません"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4521,7 +4549,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4533,7 +4561,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4544,19 +4572,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "ニュース取込"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "ニュースを次から取り込み中: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " 完了。"
 
@@ -4621,7 +4649,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "ウェルカム・ウィザードを開始"
 
@@ -4863,7 +4891,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "本がない"
 
@@ -5065,8 +5093,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "パス名"
 
@@ -5076,17 +5104,17 @@ msgstr "パス名"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "フォーマット"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "コレクション"
 
@@ -5096,25 +5124,25 @@ msgid "Click to open"
 msgstr "クリックして開く"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "なし"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5172,7 +5200,7 @@ msgstr "出力"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5195,14 +5223,14 @@ msgstr "出力"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5767,10 +5795,14 @@ msgstr "書籍の最初に目次を挿入しない(&T)"
 msgid "FB2 Output"
 msgstr "FB2出力"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "フォントサイズ・ウイザード"
@@ -6319,7 +6351,7 @@ msgstr "PDF出力"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:48
 msgid "&Paper Size:"
-msgstr ""
+msgstr "用紙サイズ(&P)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:49
 msgid "&Orientation:"
@@ -6362,7 +6394,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "テスト"
 
@@ -6947,97 +6979,97 @@ msgstr "エラー"
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "フォーマットを指定して送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "デバイスがない"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "送信できません: デバイスが接続されていません"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "カードがない"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "送信できません: デバイスにストレージカードがありません"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "デバイスにカタログを送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "デバイスにニュースを送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "デバイスに書籍を送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7323,7 +7355,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "フォーマット"
 
@@ -7459,7 +7491,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "キャンセル(&C)"
 
@@ -7506,8 +7538,8 @@ msgid "Location"
 msgstr "位置"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7539,12 +7571,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7720,7 +7752,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:61
 msgid "Search/Replace"
-msgstr ""
+msgstr "検索/置換"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:76
@@ -7728,22 +7760,22 @@ msgid "Working"
 msgstr "処理中"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9225,12 +9257,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9299,7 +9331,7 @@ msgid "Send test mail from %s to:"
 msgstr "%s からテストメールを送信:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "テスト(&T)"
 
@@ -9534,61 +9566,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "ニュース:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "電子書籍:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9602,67 +9634,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "正規表現(&E)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "ファイル名(&N):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "タイトル："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "該当するものはありません"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "著者:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9870,48 +9920,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "デバイス上"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "サイズ (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "ライブラリ中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9986,7 +10036,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10003,12 +10053,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "次のページ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "前のページ"
 
@@ -10340,7 +10390,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:74
 msgid "&Automerge added books if they already exist in the calibre library:"
-msgstr ""
+msgstr "追加したファイルが既にcalibreライブラリにある場合は、自動的にマージする(&A)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:75
 msgid ""
@@ -10814,25 +10864,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "自動送信"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10844,91 +10901,91 @@ msgstr "狭い"
 msgid "Wide"
 msgstr "広い"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "小さい"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "大きい"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "常に"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "自動"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "停止"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "言語を選択(&L) (再起動が必要です):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "タグブラウザで平均格付けを表示(&a)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "システムトレイアイコンを有効にする(&T) (再起動が必要)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "表紙ブラウズを別ウインドウで行う(&B) (再起動が必要)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10937,22 +10994,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10962,64 +11019,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "ツールバー(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "アイコンサイズ(&I):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "適用(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "既定に戻す(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "変更の保存"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "再起動が必要です。"
@@ -11304,7 +11357,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:70
 msgid "Replace space with &underscores"
-msgstr ""
+msgstr "空白をアンダースコアに置換する(&u)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:71
 msgid "Update &metadata in saved copies"
@@ -11727,7 +11780,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:103
 msgid "&Replace"
-msgstr ""
+msgstr "置換(&R)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:104
 msgid "C&reate"
@@ -11754,30 +11807,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11874,7 +11931,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "検索"
@@ -11967,166 +12024,166 @@ msgstr "クリックして変更"
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "カテゴリ表示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "%sの管理"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "検索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12136,60 +12193,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "名前で並べ替え"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "人気で並べ替え"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "平均評価で並べ替え"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "すべてに合致"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "どれかに合致"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "ユーザカテゴリを管理(&u)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12262,34 +12319,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "変換エラー"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "レシピを無効化"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12489,7 +12546,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12567,36 +12624,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "次の章"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "前の章"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "文書の最初"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "文書の最後"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "章の頭"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "章末"
 
@@ -12672,73 +12729,73 @@ msgstr "印刷プレビュー"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "電子ブックの選択"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "電子ブック"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "ブックマークの追加"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12813,27 +12870,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "ドラッグしてサイズ変更"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "表示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "隠す"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "切り替え"
 
@@ -13137,7 +13194,7 @@ msgstr "Gmailを使う"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:146
 msgid "Use Hotmail"
-msgstr ""
+msgstr "Hotmailを使う"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:147
 msgid "&Test email"
@@ -14008,11 +14065,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14026,15 +14083,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "データベースのコンパクト化"
 
@@ -15071,101 +15128,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "未知のニュースソース"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "ダウンロード完了"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "フィードの取得中"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "表紙のダウンロードできません：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "タイトルのない文書"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15660,6 +15717,9 @@ msgstr "CSS(スタイルシート)をダウンロードしない"
 #~ msgid "Download &cover"
 #~ msgstr "表紙をダウンロード(&C)"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "有効なプラグインが見つかりませんでした: "
+
 #~ msgid "Communicate with the Kindle 2 eBook reader."
 #~ msgstr "Kindle 2 電子書籍リーダ─と通信します。"
 
@@ -15789,6 +15849,9 @@ msgstr "CSS(スタイルシート)をダウンロードしない"
 #~ "to disable."
 #~ msgstr "指定した日数より古いダウンロードしたニュースを削除する。ゼロにすると無効になる。"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "ツールバーのカスタマイズ"
+
 #~ msgid "Path to a txt file containing a comment."
 #~ msgstr "コメントが含まれるテキストファイルのパス"
 
diff --git a/src/calibre/translations/ko.po b/src/calibre/translations/ko.po
index 12627e73a6..bc1d754c0c 100644
--- a/src/calibre/translations/ko.po
+++ b/src/calibre/translations/ko.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-01-30 09:51+0000\n"
 "Last-Translator: ddfddf2k <Unknown>\n"
 "Language-Team: Korean <ko@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: 2011-03-27 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "아무 것도 안함"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "아무 것도 안함"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "아무 것도 안함"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "아무 것도 안함"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "아무 것도 안함"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "아무 것도 안함"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "아무 것도 안함"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "아무 것도 안함"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "기본"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "사용자 지정"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "설정할 수 없음"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "파일 형식"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "메타 정보 읽기"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "메타 정보 쓰기"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "분류 생성기"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "사용자 인터페이스 동작"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "환경설정"
@@ -327,8 +327,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "자신의 서평이나 시평을 Calibre 책 리스트에 첨가 또는 제거합니다"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "도구 모음 사용자 정의"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -337,7 +337,7 @@ msgid ""
 msgstr "도구 모음과 마우스 우측 버튼 메뉴를 사용자 정의합니다."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -650,35 +650,31 @@ msgstr "B&N Nook Color를 위한 개요"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Sanda Bambook을 위한 개요"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "설치된 플러그인"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "파일 종류 플러그인을 위한 맵핑"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "로컬 플러그인 설정"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "사용되지 않는 플러그인"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "사용 중인 플러그인"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "유효한 플러그인을 찾을 수 없음 "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "플러그인 %s의 초기화가 실패하였습니다"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -690,29 +686,29 @@ msgstr ""
 "    Customize calibre by loading external plugins.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "플러그인을 포함하고 있는 압축 파일의 경로를 지정하여 플러그인을 추가합니다"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "이름을 기준으로 커스텀 플러그인을 제거합니다. 내장된 플러그인에는 적용되지 않습니다."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "플러그인을 설정합니다. 플러그인의 이름과 콤마로 구분된 설정 문자열을 지정합니다."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "설치된 플러그인을 나열합니다."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "주어진 이름의 플러그인을 사용합니다"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "주어진 이름의 플러그인을 사용하지 않습니다"
 
@@ -734,43 +730,55 @@ msgstr "장치에 전자책을 전송할 디렉토리의 목록입니다. 쉼표
 msgid "Communicate with S60 phones."
 msgstr "S60 휴대폰과 통신합니다."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "iTunes/iBooks에 분류로서 시리즈를 사용"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "iTunes/iBooks에서 표지를 캐시합니다"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple 장치"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "iTunes/iBooks와 통신합니다."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Apple 장치가 감지되어 iTunes를 실행합니다. 기다려주세요..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -778,27 +786,27 @@ msgstr ""
 "iDevice로 부터 책을 직접적으로 복사할 수 없습니다. 마우스를 이용하여, iTunes 라이브러리로 부터 직접 "
 "Calibre라이브러리에 추가하십시오"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "장치의 메타 정보 목록을 갱신합니다..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "완료됨"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -808,7 +816,7 @@ msgstr ""
 "iBooks 앱을 이용해서 삭제합니다.\n"
 "목록를 보려면 '상세히 보기'를 누르세요."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -816,31 +824,31 @@ msgstr ""
 "일부 표지를 변환할 수 없었습니다.\n"
 "목록을 보려면 '상세히 보기'를 누르세요."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "뉴스"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "분류"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "iTunes와 통신합니다."
 
@@ -884,20 +892,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "장치에 있는 책의 목록을 가져옵니다..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "책을 장치로 전송합니다..."
 
@@ -905,8 +913,8 @@ msgstr "책을 장치로 전송합니다..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "책을 장치의 메타 정보 목록으로 추가합니다..."
 
@@ -916,8 +924,8 @@ msgstr "책을 장치의 메타 정보 목록으로 추가합니다..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "장치에서 책을 삭제합니다..."
 
@@ -925,17 +933,17 @@ msgstr "장치에서 책을 삭제합니다..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "장치의 메타 정보 목록에서 책을 삭제합니다..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "메타 정보를 장치로 전송합니다..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1237,32 +1245,32 @@ msgstr "Sony PRS-500 전자책 리더와 통신합니다"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "모든 Sony eBook readers과 통신합니다."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr "메타 정보 필드안의 콤마로 불리된 목록은 기기상의 모음집으로 변환될 것입니다. "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1271,29 +1279,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1426,7 +1445,7 @@ msgstr "추가 설정"
 msgid "Communicate with an eBook reader."
 msgstr "전자책 리더와 통신합니다."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "장치 정보를 얻습니다."
 
@@ -2113,7 +2132,7 @@ msgstr "입력을 HTML로 변환합니다..."
 msgid "Running transforms on ebook..."
 msgstr "전자책에 변형을 실행합니다..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "생성 중"
 
@@ -2237,7 +2256,7 @@ msgstr "시작"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "책의 시작 부분에 목차를 삽입하지 않습니다."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2248,6 +2267,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2612,105 +2635,105 @@ msgstr "압축파일(zip/rar)에서 전자책 파일을 추출합니다. 또한
 msgid "TEMPLATE ERROR"
 msgstr "템플릿 오류"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "아니오"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "예"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "제목"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "저자"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "출판사"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "제작자"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "설명"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "태그"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "시리즈"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "언어"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "시간 정보"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "출판일자"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "권리"
 
@@ -3100,7 +3123,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3233,7 +3256,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML 목차(TOC) 생성 옵션입니다."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3419,6 +3442,7 @@ msgid "Author"
 msgstr "저자"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "제목"
 
@@ -3712,135 +3736,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "기본값으로 주 메모리 대신에 저장 카드에 파일을 전송합니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "삭제하기 전에 확인합니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "메인 창의 구조"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "새 버전이 나왔을 때 알림"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "시리즈 번호에 대해 로마식 숫자를 사용"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "태그 목록을 이름, 인기도, 별점 순으로 정렬합니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "표지 탐색기 모드에서 보여줄 표지의 개수입니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "LRF 전자책 뷰어에 대한 옵션"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "내부 뷰어를 사용해서 볼 형식"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "책 목록에서 표시할 열"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "프로그램이 시작할 때 컨텐츠 서버를 자동으로 실행합니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "데이터베이스의 오래된 뉴스를 유지함"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "시스템 트레이 아이콘 보기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "내려받은 뉴스를 장치로 올립니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "책을 장치에 올려보내고 나서 라이브러리에서 삭제하기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "Calibre 주 창 대신에 독립된 창에 표지를 표시합니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "시스템 트레이 아이콘에서 알리기 사용 안함"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "장치로 전송 버튼을 누를 때 수행할 기본 동작입니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "작업 프로세스의 최대 대기 수"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "소셜 메타 정보(태그/별점/기타) 내려받기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "제목과 저자를 새로운 메타 정보로 덮어쓰기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "가능하다면 표지를 자동으로 내려받습니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "동시에 작업하는 최대 개수를 CPU의 개수로 제한합니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "사용자 인터페이스의 배치"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "UI 애니메이션을 사용하지 않음"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "표시하지 않을 태그 탐색기의 분류"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "파일 선택하기"
 
@@ -4050,8 +4078,8 @@ msgstr "메인 라이브러리에서만 사용자 주석을 생성"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "선택된 책이 없습니다"
@@ -4248,7 +4276,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4314,7 +4342,7 @@ msgid "Bulk convert"
 msgstr "단체로 변환하기"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "변환할 수 없음"
 
@@ -4322,7 +4350,7 @@ msgstr "변환할 수 없음"
 msgid "Starting conversion of %d book(s)"
 msgstr "%d 권의 책의 변환을 시작합니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4503,7 +4531,7 @@ msgid "Stop Content Server"
 msgstr "컨텐츠 서버 정지"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4511,32 +4539,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "전자우편을 기반으로 책 공유하기 설정"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "장치로 전송하기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "연결/공유"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4623,26 +4651,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "메타 정보를 수정할 수 없습니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "책 병합 불가"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "최소한 두 권의 책을 병합하기 위해 선택해야 합니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4650,7 +4678,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4662,7 +4690,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4673,19 +4701,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "뉴스 가져오기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "뉴스를 가져옵니다: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " 가져왔습니다."
 
@@ -4750,7 +4778,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "마법사 실행하기"
 
@@ -4992,7 +5020,7 @@ msgid "The specified directory could not be processed."
 msgstr "지정한 디렉토리는 처리할 수 없습니다."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "책 없음"
 
@@ -5194,8 +5222,8 @@ msgstr "폴더마다 여러권의 책, 모든 전자책 파일은 다른 책이
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "경로"
 
@@ -5205,17 +5233,17 @@ msgstr "경로"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "형식"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "모음집"
 
@@ -5225,25 +5253,25 @@ msgid "Click to open"
 msgstr "열려면 누르세요"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "없음"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5301,7 +5329,7 @@ msgstr "출력"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5324,14 +5352,14 @@ msgstr "출력"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5896,10 +5924,14 @@ msgstr "책의 시작 부분에 목차를 삽입하지 않습니다(&T)."
 msgid "FB2 Output"
 msgstr "FB2 출력"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "글자 크기 변경 마법사"
@@ -6494,7 +6526,7 @@ msgid "Regex:"
 msgstr "정규식:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "시험"
 
@@ -7093,97 +7125,97 @@ msgstr "오류"
 msgid "Error communicating with device"
 msgstr "장치와 통신 도중 오류"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "적합한 형식이 아닙니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "장치로서 열 폴더를 선택하세요"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "장치와 교신 도중 오류"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "장치: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " 탐지되었습니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "장치로 전송할 형식을 선택하세요"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "장치 없음"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "전송 불가: 연결된 장치가 없음"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "카드 없음"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "전송 불가: 저장 카드가 없음"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "다음의 책들을 장치에 올리기 전에 자동으로 변환합니까?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "분류를 장치로 전송합니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "뉴스를 장치로 전송합니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "책을 장치로 전송합니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "장치에 공간이 없습니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>장치에 남은 공간이 없어서 책을 올려보낼 수 없습니다 "
@@ -7469,7 +7501,7 @@ msgstr "형식을 선택하세요"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "형식"
 
@@ -7605,7 +7637,7 @@ msgstr "확인(&O)"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "취소(&C)"
 
@@ -7652,8 +7684,8 @@ msgid "Location"
 msgstr "위치"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7685,12 +7717,12 @@ msgid "Author sort"
 msgstr "저자 분류"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "잘못된 저자명"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7877,22 +7909,22 @@ msgid "Working"
 msgstr "작업 중"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "소문자"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "대문자"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "제목 대소문자"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9377,12 +9409,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "항목이 비어있음"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9451,7 +9483,7 @@ msgid "Send test mail from %s to:"
 msgstr "%s 에게서 편지 보내기를 시험할 받는이 주소:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "시험(&T)"
 
@@ -9686,61 +9718,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "뉴스:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "전자책:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "다음의 책들을 전자우편을 통해서 보내기 전에 자동으로 변환합니까?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9754,67 +9786,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "정규 표현식(&E)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "파일명(&N):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "제목:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "정규 표현식 (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "일치하지 않습니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "저자:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "정규 표현식 (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "시리즈:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "정규 표현식 (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "시리즈 색인:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "정규 표현식 (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "정규 표현식 (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "표지 탐색기"
@@ -10022,48 +10072,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "장치"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "용량 (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "검색 이름은 \"{0}\"입니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "용량"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "%s 제<font face=\"serif\">%s</font>권"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "<b>편집</b>하려면 더블클릭하세요<br><br>"
 
@@ -10138,7 +10188,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "일치하는 것이 없습니다"
 
@@ -10155,12 +10205,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF 뷰어 툴바"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "다음 쪽"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "이전 쪽"
 
@@ -10978,25 +11028,32 @@ msgstr "기본값 만듦(&D)"
 msgid "&Remove email"
 msgstr "전자우편 제거(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "자동 송신"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "전자우편"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "전자우편으로 보낼 형식입니다. 우선 일치하는 형식을 송신합니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr "선택하면, 내려받은 뉴스를 이 전자우편 주소로 자동으로 편지를 보냅니다 (형식 목록 중에 하나일 경우)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "새 전자우편 주소"
 
@@ -11008,91 +11065,91 @@ msgstr "좁게"
 msgid "Wide"
 msgstr "넓게"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "중간"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "작음"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "큼"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "항상"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "자동"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "전혀 안함"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "사용자 인터페이스 배치 (재시작이 필요함) (&L) :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "탐색기 모드에서 보여줄 표지의 개수 (재시작이 필요함) (&N):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "언어 선택 (재시작이 필요합니다) (&L):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "태그 탐색기에 평균 등급을 표시합니다(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr "모든 애니메이션을 사용하지 않습니다. 느리고 오래된 컴퓨터에 유용합니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "애니메이션 사용 안함(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "시스템 트레이 아이콘 사용하기 (재시작이 필요함) (&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "프로그램 시작시 로고 화면 표시(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "시스템 트레이에서 알리기 사용 안함(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "시리즈에 대해 로마식 숫자를 사용(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "표지 탐색기를 분리된 창으로 표시합니다 (재시작이 필요함) (&B)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11101,22 +11158,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11126,64 +11183,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "툴바(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "아이콘 크기(&I):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "아이콘 아래에 텍스트 표시(&T):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "도구 상자를 두 개로 분할합니다(&S)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "인터페이스 글꼴:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "글꼴 변경 (재시작 필요)(&F)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "적용(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "취소하고 되돌아갑니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr "일부 변경 사항이 재시작을 필요로 합니다. 가능한 빨리 Calibre를 재시작 해주세요."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "재시작 필요"
@@ -11921,30 +11974,34 @@ msgid "The main toolbar"
 msgstr "주 도구막대"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "장치가 연결되었을 때의 주 도구막대"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Calibre 라이브러리의 책에 대한 문맥 메뉴"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "장치의 책에 대한 문맥 메뉴"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12041,7 +12098,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "검색"
@@ -12134,166 +12191,166 @@ msgstr "누르면 바뀝니다"
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "%s 분류 숨기기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "분류 보기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "%s 관리"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "저장된 검색 관리"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "사용자 분류 관리"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "모든 분류 보기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "검색"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "검색 이름 중복"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "저장된 검색 이름 %s은(는) 이미 사용중입니다."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "태그 탐색기에서 항목 찾기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12303,60 +12360,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "찾기(&I)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "처음/다음 일치하는 항목 찾기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "모든 카테고리 접기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr "더이상 일치하는 항목이 없습니다.</b><p> 처음부터 다시 하려면 찾기 버튼을 누르세요"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "이름순으로 정렬"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "인기도 순으로 정렬"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "평균 별점 순으로 정렬"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "태그 탐색기의 항목에 대한 정렬 방식을 지정합니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "모두 일치(AND)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "아무거나 일치(OR)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "사용자 분류 관리(&U)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "태그 탐색기로 자신의 분류를 추가합니다"
 
@@ -12429,34 +12486,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "변환 오류"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "레시피 사용 안함"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>실패</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "활동중인 작업이 있습니다. 종료하는게 확실합니까?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12656,7 +12713,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "전자책 뷰어 사용자 정의 옵션"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "최근 사용된 창 크기를 기억"
 
@@ -12734,36 +12791,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "이동하기..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "다음 구간"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "이전 구간"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "문서 시작"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "문서 끝"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "구간 시작"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "구간 끝"
 
@@ -12839,73 +12896,73 @@ msgstr "인쇄 미리보기"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "전자책 선택"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "전자책"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "다음에 대해 일치하는 것이 없습니다: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "북마크 추가"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "북마크에 대한 제목을 입력하세요:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "북마크 관리"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "책 불러오는중..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "전자책을 열 수 없음"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "전자책 뷰어를 제어하는 옵션"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "콘솔에 자바스크립트 경고와 콘솔 메시지를 출력합니다"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12983,27 +13040,27 @@ msgstr "이전 찾기"
 msgid "Print eBook"
 msgstr "전자책 인쇄하기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "대소문자 바꾸기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "대소문자 바꾸기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "크기를 변경하려면 드래그하세요"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "보기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "숨기기"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14205,11 +14262,11 @@ msgstr ""
 "\n"
 "For help on an individual command: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "라벨이 제공되지 않았습니다"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14223,15 +14280,15 @@ msgstr "%s평균 별점은 %3.1f 입니다"
 msgid "Main"
 msgstr "주"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "<b>%s</b> 복사하는중"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15276,101 +15333,101 @@ msgstr "calibre 서버에서 내장된 리시프의 최신 버전을 내려받
 msgid "Unknown News Source"
 msgstr "알 수 없는 뉴스 소스"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "'%s' 리시프는 사용자 이름과 암호를 필요로 합니다."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "내려받기 완료"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "다음 게시물의 내려받기가 실패:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "다음 게시물의 부분적 내려받기가 실패:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\t실패한 링크:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "공급자를 가져옵니다..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "색인 페이지에서 가져온 공급자"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "표지의 내려받기를 시도합니다..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "내려받기 시작 [%d 개의 스레드]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "%s에 내려받은 공급자"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "표지를 내려받을 수 없습니다: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "%s 에서 표지를 내려받습니다"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "제목없는 게시물"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "게시물 내려받음: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "게시물 내려받기 실패: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "공급자 가져오기"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15480,6 +15537,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr "CSS 스타일시트를 내려받지 않음"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "유효한 플러그인을 찾을 수 없음 "
+
 #~ msgid "Communicate with the Cybook Gen 3 eBook reader."
 #~ msgstr "Cybook Gen 3 전자책 리더와 통신합니다"
 
@@ -16190,6 +16250,12 @@ msgstr "CSS 스타일시트를 내려받지 않음"
 #~ msgid "Update available"
 #~ msgstr "업데이트가 가능합니다"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "도구 모음 사용자 정의"
+
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "도구 상자를 두 개로 분할합니다(&S)"
+
 #~ msgid "The priority of worker processes"
 #~ msgstr "작업 프로세스의 우선 순위"
 
diff --git a/src/calibre/translations/lt.po b/src/calibre/translations/lt.po
index 38bcbe6022..e55a9887cd 100644
--- a/src/calibre/translations/lt.po
+++ b/src/calibre/translations/lt.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-02-12 13:00+0000\n"
 "Last-Translator: Wa1DaS <Unknown>\n"
 "Language-Team: Lithuanian <lt@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: 2011-03-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Nieko nedaro"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Nieko nedaro"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Nieko nedaro"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Nieko nedaro"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Nieko nedaro"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Nieko nedaro"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Nieko nedaro"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Nieko nedaro"
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Pagrindas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Adaptuoti"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Bylos tipas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Meta duomenu skaitytuvas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Meta duomenų rašymas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalogo generatorius"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Vartotojo sąsajos veiksmas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Parinktys"
@@ -327,8 +327,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "pridėti/šalinti savo stulpelius į calibre knygų sąrašą"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Tinkinti įrankių juostą"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -337,7 +337,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -648,35 +648,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Idiėgti įskiepiai"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Išjungti įskiepiai"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Įjungti įskiepiai"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -688,29 +684,29 @@ msgstr ""
 "    Tinkinti calibre užkraunant išorinius įskiepus.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Parodyti įdiegtus įskiepius"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -732,106 +728,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple įrenginys"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "baigta"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Naujienos"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalogas"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -875,20 +883,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -896,8 +904,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -907,8 +915,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -916,17 +924,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1225,32 +1233,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1259,29 +1267,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1414,7 +1433,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2051,7 +2070,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2166,7 +2185,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2177,6 +2196,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2526,105 +2549,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3007,7 +3030,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3140,7 +3163,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3306,6 +3329,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3570,135 +3594,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3906,8 +3934,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4104,7 +4132,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4170,7 +4198,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4178,7 +4206,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4359,7 +4387,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4367,32 +4395,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4479,26 +4507,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4506,7 +4534,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4518,7 +4546,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4529,19 +4557,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4606,7 +4634,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4848,7 +4876,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5050,8 +5078,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5061,17 +5089,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5081,25 +5109,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5157,7 +5185,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5180,14 +5208,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5752,10 +5780,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6347,7 +6379,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6932,97 +6964,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7308,7 +7340,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7444,7 +7476,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7491,8 +7523,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7524,12 +7556,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7713,22 +7745,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9208,12 +9240,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9282,7 +9314,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9517,61 +9549,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9585,67 +9617,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9853,48 +9903,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9969,7 +10019,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9986,12 +10036,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10797,25 +10847,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10827,91 +10884,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10920,22 +10977,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10945,64 +11002,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11733,30 +11786,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11853,7 +11910,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11946,166 +12003,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12115,60 +12172,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12241,34 +12298,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12468,7 +12525,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12546,36 +12603,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12651,73 +12708,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12792,27 +12849,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13978,11 +14035,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13996,15 +14053,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15041,101 +15098,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15247,3 +15304,6 @@ msgstr ""
 
 #~ msgid " "
 #~ msgstr " "
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Tinkinti įrankių juostą"
diff --git a/src/calibre/translations/lv.po b/src/calibre/translations/lv.po
index 4814f7feb0..1f4815b397 100644
--- a/src/calibre/translations/lv.po
+++ b/src/calibre/translations/lv.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-12-18 16:39+0000\n"
 "Last-Translator: Vladimirs Kuzmins <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: 2011-03-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Country: LATVIA\n"
 "X-Poedit-Language: Latvian\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Pilnīgi neko nedara"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -34,7 +34,7 @@ msgstr "Pilnīgi neko nedara"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -51,9 +51,9 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -73,7 +73,7 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -119,19 +119,19 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -139,12 +139,12 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -155,11 +155,11 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -173,46 +173,46 @@ msgstr "Pilnīgi neko nedara"
 msgid "Unknown"
 msgstr "Nav zināms"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Bāze"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Faila tips"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadatu lasītājs"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadatu rakstītājs"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Iestatījumi"
@@ -329,8 +329,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr ""
+msgid "Toolbar"
+msgstr "Rīkjosla"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -339,7 +339,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -648,35 +648,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Šis profils ir paredzēts Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Uzstādītie spraudņi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Atspējotie spraudņi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Iespējotie spraudņi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -684,29 +680,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -728,106 +724,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d no %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "pabeigts"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Ziņas"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalogs"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -871,20 +879,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -892,8 +900,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -903,8 +911,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Dzēš grāmatas no ierīces..."
 
@@ -912,17 +920,17 @@ msgstr "Dzēš grāmatas no ierīces..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Sūta ierīcei grāmatu metadatus..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1221,32 +1229,32 @@ msgstr "Komunicē ar Sony PRS-500 e-grāmatu lasītāju."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1255,29 +1263,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1410,7 +1429,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2047,7 +2066,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2162,7 +2181,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2173,6 +2192,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2522,105 +2545,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Nosaukums"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autors(i)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Izdevējs"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Komentāri"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Birkas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Sērija"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Valoda"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Publicēts"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3003,7 +3026,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3136,7 +3159,7 @@ msgid "HTML TOC generation options."
 msgstr "Iestatījumi HTML satura rādītāja ģenerēšanai."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3302,6 +3325,7 @@ msgid "Author"
 msgstr "Autors"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3568,135 +3592,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3910,8 +3938,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4108,7 +4136,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4174,7 +4202,7 @@ msgid "Bulk convert"
 msgstr "Masveida pārveidošana"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Nav iespējams pārveidot"
 
@@ -4182,7 +4210,7 @@ msgstr "Nav iespējams pārveidot"
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4363,7 +4391,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4371,32 +4399,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Sūtīt uz ierīci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Savienoties/koplietot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4483,26 +4511,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Nav iespējams rediģēt metadatus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4510,7 +4538,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4522,7 +4550,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4533,19 +4561,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4610,7 +4638,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4852,7 +4880,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5054,8 +5082,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Atrodas"
 
@@ -5065,17 +5093,17 @@ msgstr "Atrodas"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formāti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5085,25 +5113,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Nav"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5161,7 +5189,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5184,14 +5212,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5756,10 +5784,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6352,7 +6384,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6939,97 +6971,97 @@ msgstr "Kļūda"
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Ierīce: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Nevar nosūtīt: Neviena ierīce nav savienota"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7315,7 +7347,7 @@ msgstr "Izvēlieties formātu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7451,7 +7483,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7498,8 +7530,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7531,12 +7563,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7726,22 +7758,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9223,12 +9255,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9297,7 +9329,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9532,61 +9564,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-grāmata:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9600,67 +9632,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9868,48 +9918,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Izmērs (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9984,7 +10034,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10001,12 +10051,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Nākošā lapa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Iepriekšējā lapa"
 
@@ -10812,25 +10862,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "E-pasts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10842,91 +10899,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Vidēja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Maza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Liela"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Izvēlieties va&lodu (nepieciešams pārstartēt):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10935,22 +10992,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10960,64 +11017,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11748,30 +11801,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11868,7 +11925,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Meklēt"
@@ -11961,166 +12018,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12130,60 +12187,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12256,34 +12313,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12483,7 +12540,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12561,36 +12618,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Nākošā sadaļa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12666,73 +12723,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12807,27 +12864,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13993,11 +14050,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14011,15 +14068,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopē <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15056,101 +15113,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Lejupielāde pabeigta"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " no "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Mēģina lejupielādēt vāku..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Lejupielādē vāku no %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15392,9 +15449,6 @@ msgstr ""
 #~ msgid "TabWidget"
 #~ msgstr "TabWidget"
 
-#~ msgid "Toolbar"
-#~ msgstr "Rīkjosla"
-
 #~ msgid ""
 #~ "No metadata found, try adjusting the title and author or the ISBN key."
 #~ msgstr ""
diff --git a/src/calibre/translations/ml.po b/src/calibre/translations/ml.po
index 01826410a4..190f62ab69 100644
--- a/src/calibre/translations/ml.po
+++ b/src/calibre/translations/ml.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-12-16 23:06+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Malayalam <ml@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: 2011-03-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "ഒന്നും തന്നെ ചെയ്തില്ല"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "ഒന്നും തന്നെ ചെയ്തില്ല"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "ഒന്നും തന്നെ ചെയ്തില്ല"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "ഒന്നും തന്നെ ചെയ്തില്ല"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "ഒന്നും തന്നെ ചെയ്തില്ല"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "ഒന്നും തന്നെ ചെയ്തില്ല"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "ഒന്നും തന്നെ ചെയ്തില്ല"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "ഒന്നും തന്നെ ചെയ്തില്ല"
 msgid "Unknown"
 msgstr "അജ്ഞാതം"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "അടിത്തറ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "ഫയല്‍ തരം"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "ക്രമീകരണങ്ങള്‍"
@@ -332,7 +332,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -342,7 +342,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -652,35 +652,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിട്ടുള്ള പ്ലുഗിനുകള്‍"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "നിര്‍ജ്ജിവം ആക്കിയിരിക്കുന്ന പ്ലുഗിനുകള്‍"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "സാധുത ഉള്ള ഒരു പ്ലുഗിനുകള്‍ ഒന്നും കണ്ടെത്തിയില്ല "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -688,31 +684,31 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിട്ടുള്ള പ്ലുഗിനുകള്‍ എല്ലാം ലിസ്റ്റ് ചെയ്യുക"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "സൂചിപ്പിച്ചിട്ടുള്ള പ്ലുഗിന്‍ പുന:ജ്ജിവിപ്പിക്കുക"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "സൂചിപ്പിച്ചിട്ടുള്ള പ്ലുഗിന്‍ നിര്‍ജ്ജിവമാക്കുക"
 
@@ -734,106 +730,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "വാര്‍ത്തകള്‍"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -877,20 +885,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "ഉപകരണത്തില്‍ ഉള്ള പുസ്തകങ്ങളുടെ ലിസ്റ്റ് എടുക്കുന്നു..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "പുസ്തകങ്ങള്‍ ഉപകരണത്തിലേക്ക് കൈമാറുന്നു..."
 
@@ -898,8 +906,8 @@ msgstr "പുസ്തകങ്ങള്‍ ഉപകരണത്തിലേ
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -909,8 +917,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "പുസ്തകങ്ങള്‍ ഉപകരണത്തില്‍ നിന്നും നീക്കം ചെയ്യുന്നു..."
 
@@ -918,17 +926,17 @@ msgstr "പുസ്തകങ്ങള്‍ ഉപകരണത്തില്
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "മെറ്റാഡേറ്റ ഉപകരണത്തിലേക്ക് അയക്കുന്നു..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1228,32 +1236,32 @@ msgstr "Sony PRS-500 eBook reader ആയി സംവദിക്കുക."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1262,29 +1270,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1417,7 +1436,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr "ഇ-ബുക്ക്‌ റീഡരുമായി സംവദിക്കുക."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "ഉപകരണത്തിന്റെ വിവരങ്ങള്‍ നേടുക..."
 
@@ -2054,7 +2073,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2169,7 +2188,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2180,6 +2199,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2529,105 +2552,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3010,7 +3033,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3143,7 +3166,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3309,6 +3332,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3573,135 +3597,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3909,8 +3937,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4107,7 +4135,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4173,7 +4201,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4181,7 +4209,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4362,7 +4390,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4370,32 +4398,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4482,26 +4510,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4509,7 +4537,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4521,7 +4549,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4532,19 +4560,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4609,7 +4637,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4851,7 +4879,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5053,8 +5081,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5064,17 +5092,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5084,25 +5112,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5160,7 +5188,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5183,14 +5211,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5755,10 +5783,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6350,7 +6382,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6935,97 +6967,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7311,7 +7343,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7447,7 +7479,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7494,8 +7526,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7527,12 +7559,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7716,22 +7748,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9211,12 +9243,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9285,7 +9317,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9520,61 +9552,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9588,67 +9620,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9856,48 +9906,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9972,7 +10022,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9989,12 +10039,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10800,25 +10850,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10830,91 +10887,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10923,22 +10980,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10948,64 +11005,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11736,30 +11789,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11856,7 +11913,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11949,166 +12006,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12118,60 +12175,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12244,34 +12301,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12471,7 +12528,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12549,36 +12606,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12654,73 +12711,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12795,27 +12852,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13981,11 +14038,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13999,15 +14056,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15044,101 +15101,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15248,6 +15305,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "സാധുത ഉള്ള ഒരു പ്ലുഗിനുകള്‍ ഒന്നും കണ്ടെത്തിയില്ല "
+
 #~ msgid "Communicate with the Kindle 2 eBook reader."
 #~ msgstr "Kindle 2 eBook reader ആയി സംവദിക്കുക."
 
diff --git a/src/calibre/translations/mr.po b/src/calibre/translations/mr.po
index 8a89f51e5e..ee116de723 100644
--- a/src/calibre/translations/mr.po
+++ b/src/calibre/translations/mr.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-09-03 19:11+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Marathi <mr@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: 2011-03-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "काहीच करत नाही"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "काहीच करत नाही"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "काहीच करत नाही"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "काहीच करत नाही"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "काहीच करत नाही"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "काहीच करत नाही"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "काहीच करत नाही"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "काहीच करत नाही"
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "पाया"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "फाईल प्रकार"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "मेटाडाटा वाचक"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "मेटाडाटा लेखक"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "पसंती"
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "पूर्ण झालेले"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "वार्ता"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "पुस्तक सूची"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "उपकरणावरील पुस्तकांची यादी घेत आहे..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "उपकरणावरील पुस्तके नष्ट करीत आहे..."
 
@@ -908,17 +916,17 @@ msgstr "उपकरणावरील पुस्तके नष्ट कर
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "नाही"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "हो"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "लेखक"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "प्रकाशक"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "निर्माता"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "शृंखला"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "भाषा"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "कालमुद्रा"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "प्रकाशित"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "हक्क"
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr "लेखक"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "विषय"
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "नष्ट करण्यापूर्वी पुष्टी करा"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "फाइल निवडा"
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "पुस्तक निवडलेले नाही"
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "रुपांतर करू शकत नाही"
 
@@ -4170,7 +4198,7 @@ msgstr "रुपांतर करू शकत नाही"
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "ड"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "फ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "पुस्तके नाही"
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "काहीच नही"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "उपकरण: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "पाठवण्यासाठी निवडलेले"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "कोणतेही उपकरण नाही"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "वार्ता:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "ई-पुस्तक"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "लेखक:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "शृंखला:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr "अरुंद"
 msgid "Wide"
 msgstr "रुंद"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "मध्यम"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "लहान"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "मोठे"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "नेहमी"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "स्वयंचलित"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "कधीच नाही"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "नावानुसार क्रमवारी"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "लोकप्रियतेनुसार क्रमवारी"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "मूल्यांकनानुसार क्रमवारी"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "सर्व जुळवा"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "कोणतेही जुळवा"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/ms.po b/src/calibre/translations/ms.po
index 8d8b3f3fd5..5ed0b3bb11 100644
--- a/src/calibre/translations/ms.po
+++ b/src/calibre/translations/ms.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-04-09 05:12+0000\n"
 "Last-Translator: esaismail@gmail.com <Unknown>\n"
 "Language-Team: Malay <ms@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: 2011-03-27 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Langsung tidak melakukan apa-apa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Langsung tidak melakukan apa-apa"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Langsung tidak melakukan apa-apa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Langsung tidak melakukan apa-apa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Langsung tidak melakukan apa-apa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Langsung tidak melakukan apa-apa"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Langsung tidak melakukan apa-apa"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Langsung tidak melakukan apa-apa"
 msgid "Unknown"
 msgstr "Tidak Diketahui"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Asas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Jenis fail"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Pembaca Metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Penulis metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Pencipta Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -333,7 +333,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -343,7 +343,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -656,35 +656,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -692,29 +688,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -736,106 +732,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -879,20 +887,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -900,8 +908,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -911,8 +919,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -920,17 +928,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1229,32 +1237,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1263,29 +1271,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1418,7 +1437,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2055,7 +2074,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2170,7 +2189,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2181,6 +2200,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2530,105 +2553,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3011,7 +3034,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3144,7 +3167,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3310,6 +3333,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3574,135 +3598,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3910,8 +3938,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4108,7 +4136,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4174,7 +4202,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4182,7 +4210,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4363,7 +4391,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4371,32 +4399,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4483,26 +4511,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4510,7 +4538,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4522,7 +4550,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4533,19 +4561,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4610,7 +4638,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4852,7 +4880,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5054,8 +5082,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5065,17 +5093,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5085,25 +5113,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5161,7 +5189,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5184,14 +5212,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5756,10 +5784,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6351,7 +6383,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6936,97 +6968,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7312,7 +7344,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7448,7 +7480,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7495,8 +7527,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7528,12 +7560,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7717,22 +7749,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9212,12 +9244,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9286,7 +9318,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9521,61 +9553,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9589,67 +9621,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9857,48 +9907,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9973,7 +10023,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9990,12 +10040,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10801,25 +10851,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10831,91 +10888,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10924,22 +10981,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10949,64 +11006,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11737,30 +11790,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11857,7 +11914,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11950,166 +12007,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12119,60 +12176,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12245,34 +12302,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12472,7 +12529,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12550,36 +12607,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12655,73 +12712,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12796,27 +12853,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13982,11 +14039,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14000,15 +14057,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15045,101 +15102,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/nb.po b/src/calibre/translations/nb.po
index 7fe6ac4f0e..591f1e0a7f 100644
--- a/src/calibre/translations/nb.po
+++ b/src/calibre/translations/nb.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-20 17:11+0000\n"
 "Last-Translator: ChiVampir <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: 2011-03-27 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Gjør absolutt ingenting"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Gjør absolutt ingenting"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Gjør absolutt ingenting"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Tilpass"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Kan ikke konfigurere"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Filtype"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadata-leser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadata-skriver"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalogoppretter"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Handlinger for brukergrensesnitt"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Innstillinger"
@@ -336,8 +336,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Legg til /fjern dine egne kolonner i calibres bokliste"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Tilpass verktøylinjen"
+msgid "Toolbar"
+msgstr "Verktøylinje"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -348,8 +348,8 @@ msgstr ""
 "tilgjengelig i hver"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Personifiser søk"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -682,35 +682,31 @@ msgstr "Denne profilen er tiltenkt B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Denne profilen er ment for Sandra Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Installerte programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Kartlegging av programtillegg for filtyper"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Lokal innstilling av programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Slå av programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Påslåtte programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Ingen gyldige programtillegg ble funnet i "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -722,19 +718,19 @@ msgstr ""
 "    Tilpass Calibre ved å laste eksterne programtillegg.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -742,15 +738,15 @@ msgstr ""
 "Tilpass programtillegg. Spesifiser navnet på programtillegget og "
 "tilpassningsstrengen separert ved komma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Se alle Installerte programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Slå på navngitte programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Slå av navngitte programtillegg"
 
@@ -774,43 +770,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Kommuniser med S60 telefoner."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Bruk serier som kategori i iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Cache omslag fra iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple-enhet"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Kommuniser med iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Apple-enhet er oppdaget, starter i iTunes, vennligst vent..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -818,27 +826,27 @@ msgstr ""
 "Kan ikke kopiere direkte fra iDevice. Klikk og dra fra iTunes biblioteket "
 "til skrivebordet, deretter legg det til calibres bibliotekhvindu."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Oppdaterer metadatalister for enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d av %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "fullført"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -848,7 +856,7 @@ msgstr ""
 "Avslutt bruk av iBook app.\n"
 "Klikk \"Vis Detaljer\" for liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -856,31 +864,31 @@ msgstr ""
 "Noen av omslagsbildene kunne ikke konverteres.\n"
 "Klikk \"Vis Detaljer\" for liste."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Nyheter"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Kommuniser med iTunes"
 
@@ -927,20 +935,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Motta liste over bøker på enheten..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Overfører bøker til enheten..."
 
@@ -948,8 +956,8 @@ msgstr "Overfører bøker til enheten..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Legg bøker til enhetens metadatalister..."
 
@@ -959,8 +967,8 @@ msgstr "Legg bøker til enhetens metadatalister..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Fjern bøker fra enheten..."
 
@@ -968,17 +976,17 @@ msgstr "Fjern bøker fra enheten..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Fjern bøker fra enhetens metadatalister..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Overfører metadata til enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK er ikke installert."
 
@@ -1291,15 +1299,15 @@ msgstr "Kommuniser med Sony PRS-500 eBook-leser."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Kommuniser med alle Sony eBook lesere."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Alle ved tittel"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Alle ved forfatter"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1307,7 +1315,7 @@ msgstr ""
 "Komma-separert liste over felt for metadata for å endre til samling på "
 "enheten. Dette inkluderer: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1317,11 +1325,11 @@ msgstr ""
 "verdiene til listen for å gjøre dem tilgjengelige. Samlingene vil bli gitt "
 "navnet som legges til etter \".\" tegnene."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Last opp separate omslagsminiatyrbilder for bøker (nyere leseplater)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1335,14 +1343,14 @@ msgstr ""
 "ADVARSEL: dette valget bør kun benyttes sammen med SONY reader nummer: 350, "
 "650, 950 og nyere."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Oppdater separate omslag når du benytter automatisk styring (nyere "
 "leseplater)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1352,11 +1360,11 @@ msgstr ""
 "til din enhet. Fjern dette valget dersom du har så mange bøker på leseplaten "
 "at ytelsen blir uakseptabelt lav."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Behold omslagsaspektsratio når du lager miniatyrbilde"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1367,6 +1375,17 @@ msgstr ""
 "ønsker at miniatyrbildet skal være av maksimum størrelse, ved å ignorere "
 "ratio."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1503,7 +1522,7 @@ msgstr "Tilleggskonfigurasjon"
 msgid "Communicate with an eBook reader."
 msgstr "Kommuniser med en eBokleser"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Få informasjon om enheten..."
 
@@ -2333,7 +2352,7 @@ msgstr "Konverterer inndata til HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Kjører transformering av e-boken..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Oppretter"
 
@@ -2488,7 +2507,7 @@ msgstr "Start"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Ikke legg til innholdsfortegnelse i begynnelsen av boken."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2506,6 +2525,10 @@ msgstr ""
 "\"Strukturoppdagelse\" og/eller instillingene av \"Innholdsfortegnelse\" "
 "(skru på \"Tving bruk av autogenerert innholdsfortegnelse)."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2905,105 +2928,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "FEIL I MALEN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Nei"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Ja"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Tittel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Forfatter(e)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Forlag"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produsent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Sammendrag:"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Nøkkelord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Språk"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Tidstempel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Publisert"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Rettigheter"
 
@@ -3449,7 +3472,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr "Amazon brukte for lang tid på å svare. Prøv igjen senere."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "KIilde for metadata"
 
@@ -3589,7 +3612,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML TOC genereringsvalg."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3784,6 +3807,7 @@ msgid "Author"
 msgstr "Forfatter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Emne"
 
@@ -4135,86 +4159,90 @@ msgstr ""
 "lagt til et txt-utdataformatsvalg som ikke er kjent, fordi lenker alltid "
 "fjernes med vanlig tekst-utdata."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Send en fil til et lagringskort i stedet for hovedminnet som standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Bekreft før sletting"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Hovedvindus geometri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Varsle dersom en ny versjon er tilgjengelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Bruk romerske tall for serienummer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Sorter emneord listet ved navn, popularitet eller bedømning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Antall omslag som skal vises ved omslagsvisningsmodus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Standarder for konvertering til LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Valgmuligheter for LRF e-bokleser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formater som er vist ved bruk av intern leser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Kolonner som skal vises i e-boklisten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Start innholdsserver automatisk ved programstart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Eldste nyheter i databasen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Vis systemikon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Legg inn nedlastede nyheter til enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Slett bøker fra biblioteket etter at du har lagt dem inn i enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "Vis omslaget i et eget vindu istedet for i calibres hovedvindu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Slå av varsler fra systemikonet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "Standard oppgaver som gjøres når send til enhet-knappen er klikket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4222,7 +4250,7 @@ msgstr ""
 "Start søk ettersom du skriver. Dersom dette valget er slått av, vil søk kun "
 "finne sted etter at Enter eller Tilbaketasten har blitt trykket ned."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
@@ -4231,45 +4259,45 @@ msgstr ""
 "Ved søk, vis alle bøker med søkeresultat fremhevet fremfor å kun vise treff. "
 "Du kan benytte N eller F3 tastene for å gå til neste treff."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maksumum antall ventende arbeidsprosesser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Last ned sosiale metadata (emneord/bedømmelser/osv.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Overskriv forfatter og tittel med nye metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Last ned omslag automatisk om dette er tilgjengelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Begrense maksimalt antall samtidige oppgaver til antallet av CPUer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Bruksområdets grensesnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 "Vis den gjennomsnittlige bedømningen pr enhetsindikasjon i emneordsøket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Slå av UI animeringer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "Merk browser-kategorier som ikke skal vises"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Velg filer"
 
@@ -4489,8 +4517,8 @@ msgstr "Brukerkommentaer genereres kun fra hovedbiblioteket"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Ingen bøker ble valgt"
@@ -4694,7 +4722,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4766,7 +4794,7 @@ msgid "Bulk convert"
 msgstr "Samlet konvertering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Kan ikke konvertere"
 
@@ -4774,7 +4802,7 @@ msgstr "Kan ikke konvertere"
 msgid "Starting conversion of %d book(s)"
 msgstr "Starter konvertering av %d bok (bøker)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "Tøm utdatafilen. Antakeligvis har konverteringsprosessen stoppet opp"
 
@@ -4963,7 +4991,7 @@ msgid "Stop Content Server"
 msgstr "Stans konverteringsserver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "-post til"
 
@@ -4971,32 +4999,32 @@ msgstr "-post til"
 msgid "Email to and delete from library"
 msgstr "E-post til og fjern fra biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(fjern fra blblioteket)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Klargjøring av e-postbasert deling av bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Send til enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Koble/del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Stopper"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "Stopper serveren. Dette kan ta flere minutter, vennligst vent..."
@@ -5083,20 +5111,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Laster ned {0} av {1} bok(bøker)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Kan ikke redigere metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Kan ikke slå sammen bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5104,7 +5132,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5116,7 +5144,7 @@ msgstr ""
 "og deretter valgte bøker vil ikke bli slettet eller "
 "forandret..<br><br>Vennligst bekreft at du ønsker å fortsette."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5137,7 +5165,7 @@ msgstr ""
 "<b>slettet</b> permanent fra ditt calibrebibliotek.<br><br>. Er du "
 "<b>sikker</b> på at du ønsker å fortsette?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5156,19 +5184,19 @@ msgstr ""
 "bøkene vil bli permanent <b>slettet</b> fra ditt calibrebibliotek.<br><br> "
 "Er du <b>sikker</b> på at du vil fortsette?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Hent nyheter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Skaffer nyheter fra "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " funnet."
 
@@ -5233,7 +5261,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Kjør velkomstveiviser"
 
@@ -5485,7 +5513,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:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Ingen bøker"
 
@@ -5705,8 +5733,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Bane"
 
@@ -5716,17 +5744,17 @@ msgstr "Bane"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formater"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Samlinger"
 
@@ -5736,25 +5764,25 @@ msgid "Click to open"
 msgstr "Klikk for å åpne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Ingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Lim inn omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Kopier omslag"
 
@@ -5812,7 +5840,7 @@ msgstr "utdata"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5835,14 +5863,14 @@ msgstr "utdata"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6437,10 +6465,14 @@ msgstr "Ikke legg inn en &Innholdsfortegnelse ved begynnelsen av boken."
 msgid "FB2 Output"
 msgstr "FB2 Utdata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Seksjoner:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Veiviser for omskalering av fontstørrelse"
@@ -7068,7 +7100,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7674,21 +7706,21 @@ msgstr "Feil"
 msgid "Error communicating with device"
 msgstr "Feil ved kommunikasjonen med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Ingen passende formater"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Velg mappe som skal åpnes som enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Feil ved komminikasjonen med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7696,67 +7728,67 @@ 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Enhet: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " Funnet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /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:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Velg format for å sende til enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Ingen enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 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:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Ingen kort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Sender kataloger til enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Sender nyheter til enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Sender bøker til enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7765,11 +7797,11 @@ msgstr ""
 "ble funnet. Konverter boken/bøkene til et format som er støttet av din enhet "
 "først."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Ikke plass på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -8070,7 +8102,7 @@ msgstr "Velg format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -8208,7 +8240,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Avbryt"
 
@@ -8257,8 +8289,8 @@ msgid "Location"
 msgstr "Lokalisering"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8290,12 +8322,12 @@ msgid "Author sort"
 msgstr "Sortering blant forfattere"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Feil ved forfatternavn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Forfatternavn kan ikke inneholde & tegn"
 
@@ -8487,22 +8519,22 @@ msgid "Working"
 msgstr "prossesserer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Små bokstaver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Store bokstaver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Store eller små bokstaver i tittelen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Store bokstaver"
 
@@ -10098,12 +10130,12 @@ msgid "%s (was %s)"
 msgstr "%s (var %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Inneholder ingenting"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 "Innholdet kan ikke stilles inn for å gjøre ingenting. Slett det istedet."
@@ -10175,7 +10207,7 @@ msgid "Send test mail from %s to:"
 msgstr "Send test e-post fra %s til:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -10429,63 +10461,63 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "e-post til %s til %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Nyheter:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Vedlagt føler %s som periodisk lastes ned fra calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Vedlagt finner du e-boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "av"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "i %s format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Sender e-post til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 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/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Kunne ikke sende bok med e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "sent"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Sent nyheter til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10499,67 +10531,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Regulære &uttrykk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Fil&navn:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Tittel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regulære uttrykk (?P&lt;tittel&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Ingen treff"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Forfattere:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Regulært uttrykk (?P<forfatter>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Serier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regulært uttrykk (?P<serier>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Serieoppføring"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regulært uttrykk (?P<serieoppføring>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regulært uttrykk (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Omslagssøker"
@@ -10770,48 +10820,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Rediger mal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "i enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Størrelse (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Bok %s av %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Søkenavnet er  \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "Denne bokens UUID er \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Størrelse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Merket for sletting"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dobbelklikk til <b>rediger</b> me<br><br>"
 
@@ -10888,7 +10938,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Ingen treff</b> for søkefrasen <i>%s</i> ble funnet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Ingen treff"
 
@@ -10905,12 +10955,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF Leser verktøylinje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Neste side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Forrige side"
 
@@ -11767,19 +11817,26 @@ msgstr "Lag &standard"
 msgid "&Remove email"
 msgstr "&Fjern e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Autosend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "E-Post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formater til e-post. Det første samsvarende formatet vil bli sendt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11787,7 +11844,7 @@ msgstr ""
 "Dersom merket av, vil nedlastede nyheter automatisk bli sent <br>til denne e-"
 "postadressen (dersom det er i ett av de opplistede formatene)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "ny e-postadresse"
 
@@ -11799,92 +11856,92 @@ msgstr "Reduser"
 msgid "Wide"
 msgstr "Bred"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Medium"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Små"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Store"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Alltid"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Aldri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Ved første bokstav"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Partisjonert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Brukergrensesnitt-&visning (krever omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Velg &språk (krever omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Vis &gjennomsnittsvurdering i emneordspanelet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 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/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Slå av &animeringer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Slå på oppgave&panelikonet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Vis &splash bilde når enheten starter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Deaktivering og varsler i systemstatusfeltet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Bruk &romerske tall for serier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 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/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11898,22 +11955,22 @@ msgstr ""
 "å få en liste av faste størrelsegrupper. Velg deaktivert\n"
 "dersom du aldri ønsker underkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11923,52 +11980,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Verktøylinje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Ikonstørrelse:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Vis &tekst under ikoner:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Del verktøylinjen til to verktøylinjer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Tegnsett for grensesnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Endre &tegnsett (krever omstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Bruk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Gjenopprett &standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Lagre endringer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Avbryt og gå tilbake til oversikt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Gjenoppretter til standarder er ikke støttet av"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11976,7 +12029,7 @@ msgstr ""
 "Noen av endringene du har gjort krever en omstart. Vennligst avslutt og "
 "start opp calibre igjen så snart som mulig."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11985,7 +12038,7 @@ msgstr ""
 "umiddelbart. Du tillates ikke å endre flere preferanser før omstart har "
 "blitt gjennomført."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Gjennomfør omstart"
@@ -12787,30 +12840,34 @@ msgid "The main toolbar"
 msgstr "Hvedverktøylinje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Hovedverktøylinje når en enhet er koblet til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Kontekstmeny for bøker i calibre-biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Kontekstmeny for bøker på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Kan ikke legge til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Kan ikke legge til handlingen %s til dette området"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Kan ikke fjerne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Kan ikke fjerne handlingen %s fra dette området"
 
@@ -12910,7 +12967,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Søk"
@@ -13003,166 +13060,166 @@ msgstr "Klikk for å endre"
 msgid "&Alternate shortcut:"
 msgstr "&Veksle mellom snarveier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Skjul kategorien %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Vis kategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Administrere %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Administrere lagrede søk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Administrere brukerkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Vis alle kategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr "Å endre forfattere for mange bøker kan ta tid. Er du sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr "Endring av metadata for mange bøker kan ta tid. Er du sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Søk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Dupliser søkenavn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "Det lagrede søkenavnet %s er allerede benyttet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13172,61 +13229,61 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Sorter etter navn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Sorter etter popularitet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Sorter etter gjennomsnittsbedømning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Sett sorteringsrekkefølge for oppføringer i emneordleseren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Sammenlign alle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Sammenlign hviklet som helst"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Når du velger flere oppføringer i emneordleseren, bruk noen eller alle av dem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Administrer &brukerkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Legg til dine egne kategorier til emneordleseren"
 
@@ -13306,23 +13363,23 @@ msgstr ""
 "calibre, vil feilsøkingsloggen bli tilgjengelig i feltet: %s<p>Denne loggen "
 "vil vises automatisk."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Beskrivelse Slettet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Feilet</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13332,11 +13389,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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13543,7 +13600,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Valgmuligheter for å egendefinere e-bokleseren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Husk sist brukte vindustørrelse"
 
@@ -13626,36 +13683,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Slå opp i ordboken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Gå til..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Neste Avsnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Forrige Avsnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Begynnelsen av dokumentet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Slutten av dokumentet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Begynnelsen av avsnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Slutten av avsnittet"
 
@@ -13732,76 +13789,76 @@ msgstr "Forhåndsvisning av utskrift"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Kobler til dict.org for å slå opp:<b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Velg e-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "E-bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Ingen treff ble funnet for: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Lastingsflyt..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Legger ut %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Bokmerke #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Legg til bokmerke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Legg inn tittel for bokmerke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Behandle bokmerker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Laster e-bok..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Kunne ikke åpne e-boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Valgmuligheter for å kontrollere e-bokleseren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Om spesifisert, vil leservinduet forsøke å legge seg foran når den starter."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Om spesifisert vil visningsvinduet forsøke å åpne fullskjermsvisning når den "
 "starter."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Skriv ut javascriptadvarsel og konsollmeldinger til konsollen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13879,27 +13936,27 @@ msgstr "Finn forrige hendelse"
 msgid "Print eBook"
 msgstr "Skriv ut e-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Endre mellom store og små bokstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Bytt mellom store og små bokstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Dra for å endre størrelse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Vis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Skjul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Veksle"
 
@@ -15313,11 +15370,11 @@ msgstr ""
 "\n"
 "For hjelp til en individuell kommando: %%prog kommando --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Ingen merkelapp ble lagt til"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15333,15 +15390,15 @@ msgstr "%sGjennomsnittlig vurdering er %3.1f"
 msgid "Main"
 msgstr "Hovedvalg"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p> Migrerer gammel database til e-bokbiblioteket i %s<br><senter>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopierer <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Komprimerer databasen"
 
@@ -16437,95 +16494,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Ukjent nyhetskilde"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Nedlasting ferdig"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " fra "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tUgyldige lenker:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Henter matinger..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Funnet matinger fra indeksside"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Forsøker å laste ned omslag..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Genererer mastetopp..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Starter nedlasting [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Matinger er lastet ned til %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Kunne ikke laste ned omslag: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Laster ned omslag fra %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Mastetopp-bilde er lastet ned"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Utittelert artikkel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artikkelen har blitt lastet ned: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Artikkelen kunne ikke lastes ned: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Henter mating"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16533,7 +16590,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17217,6 +17274,9 @@ msgstr "Ikke last ned CSS stilsett"
 #~ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 #~ msgstr "Denne profilen er ment for SONY PRS serien. 500/505/700 osv."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Ingen gyldige programtillegg ble funnet i "
+
 #~ msgid "Communicate with the BeBook eBook reader."
 #~ msgstr "Kommuniser med BeBook eBook-leser."
 
@@ -17543,9 +17603,6 @@ msgstr "Ikke last ned CSS stilsett"
 #~ msgid "Show &notifications in system tray"
 #~ msgstr "Vis &varsler i oppgavepanelet"
 
-#~ msgid "Toolbar"
-#~ msgstr "Verktøylinje"
-
 #~ msgid "&Button size in toolbar"
 #~ msgstr "&Knappestørrelse i verktøylinjen"
 
@@ -18862,6 +18919,9 @@ msgstr "Ikke last ned CSS stilsett"
 #~ msgid "book"
 #~ msgstr "bok"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Tilpass verktøylinjen"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Kommuniser med Kogan"
 
@@ -19169,6 +19229,9 @@ msgstr "Ikke last ned CSS stilsett"
 #~ "Du har endret emneord. For å kunne redigere emneord må du enten forkaste "
 #~ "eller legge til disse endringene"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Del verktøylinjen til to verktøylinjer"
+
 #~ msgid ""
 #~ "%s has been updated to version <b>%s</b>. See the <a href=\"http://calibre-"
 #~ "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -19334,3 +19397,6 @@ msgstr "Ikke last ned CSS stilsett"
 
 #~ msgid "Plugin {0} successfully removed"
 #~ msgstr "Programtillegg {0} ble fjernet"
+
+#~ msgid "Customize searching"
+#~ msgstr "Personifiser søk"
diff --git a/src/calibre/translations/nds.po b/src/calibre/translations/nds.po
index 6140681555..f4934704fa 100644
--- a/src/calibre/translations/nds.po
+++ b/src/calibre/translations/nds.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nds\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-01-07 02:48+0000\n"
 "Last-Translator: heinz beck <Unknown>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-27 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-Language: German\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Mach absolut garnichts"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -35,7 +35,7 @@ msgstr "Mach absolut garnichts"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -52,9 +52,9 @@ msgstr "Mach absolut garnichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -74,7 +74,7 @@ msgstr "Mach absolut garnichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -120,19 +120,19 @@ msgstr "Mach absolut garnichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -140,12 +140,12 @@ msgstr "Mach absolut garnichts"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -156,11 +156,11 @@ msgstr "Mach absolut garnichts"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -174,46 +174,46 @@ msgstr "Mach absolut garnichts"
 msgid "Unknown"
 msgstr "Kennen wi nich"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Basis"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Konfiguration nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Datei Typ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadaten Reader"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadaten Writer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalogerstellung"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Instellen"
@@ -336,8 +336,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr ""
+msgid "Toolbar"
+msgstr "Symbolleiste"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -346,7 +346,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -670,35 +670,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Installierte Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapping für Dateityp Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Lokale Plugin Anpassung"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Ausgeschaltene Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Kein gültiges Plugin gefunden in "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Staren des Plugins %s schlug fehl. Traceback:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -710,19 +706,19 @@ msgstr ""
 "    Calibre anpassen durch das Laden externer Plugins.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -730,15 +726,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:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Installierte Plugins auflisten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Gewähltes Plugin einschalten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Gewähltes Plugin ausschalten"
 
@@ -762,106 +758,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Nachrichten"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -905,20 +913,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Erhalte die Liste der Bücher auf dem Gerät..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Übertrage Bücher ans Gerät..."
 
@@ -926,8 +934,8 @@ msgstr "Übertrage Bücher ans Gerät..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Füge Bücher zur Metadaten Liste des Geräts hinzu..."
 
@@ -937,8 +945,8 @@ msgstr "Füge Bücher zur Metadaten Liste des Geräts hinzu..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Entferne Bücher vom Gerät..."
 
@@ -946,17 +954,17 @@ msgstr "Entferne Bücher vom Gerät..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Entferne Bücher von der Metadaten Liste des Geräts..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Sende Metadaten ans Gerät..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1255,15 +1263,15 @@ msgstr "Kommunikation mit dem Sony PRS-500 eBook Reader."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1271,18 +1279,18 @@ msgstr ""
 "Mit Kommata getrennte Liste von Metadatenfeldern um Büchersammlungen auf dem "
 "Gerät zu erstellen. Möglichkeiten sind: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1291,29 +1299,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1448,7 +1467,7 @@ msgstr "Besondere Anpassung"
 msgid "Communicate with an eBook reader."
 msgstr "Kommunikation mit einem eBook Reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Erhalte Geräte Information..."
 
@@ -2233,7 +2252,7 @@ msgstr "Konvertiere Eingabe zu HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Führe Veränderungen am eBook durch..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Erstelle"
 
@@ -2364,7 +2383,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Kein Inhaltsverzeichnis am Anfang des Buches einfügen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2375,6 +2394,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2769,105 +2792,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produzent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Bemerkung"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiketten"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Reihe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Sprache"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Rechte"
 
@@ -3287,7 +3310,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3422,7 +3445,7 @@ msgid "HTML TOC generation options."
 msgstr "Einstellungen zur Erstellung von HTML Inhaltsverzeichnissen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3625,6 +3648,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Thema"
 
@@ -3936,74 +3960,78 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Datei auf die Speicherkarte anstatt in den Hauptspeicher des Gerätes "
 "(Voreinstellung) senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Bestätigung vor dem Löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Aufteilung des Hauptfensters"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Benachrichtigen, wenn eine neue Version verfügbar ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Benutze römische Ziffern für Reihennummerierung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Anzahl der Umschlagbilder, die im Cover-Ansicht Modus angezeit werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Voreinstellungen für Konvertierung zu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Optionen für den LRF eBook Viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formate, die mithilfe des internen Viewers angesehen werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Spalten, die in der Liste der Bücher angezeigt werden sollen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Content Server automatisch beim Aufrufen von Calibre starten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Älteste in der Datenbank gespeicherte Nachrichten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Symbol im Systembereich der Kontrollleiste anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Geladene Nachrichten auf das Gerät übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Bücher nach der Übertragung auf das Gerät aus der Bibliothek löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4011,68 +4039,68 @@ msgstr ""
 "Zeige Cover-Ansicht in einem eigenen Fenster anstatt im Hauptfenster von "
 "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 "Benachrichtigungen aus dem Systembereich der Kontrollleiste deaktivieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Voreingestellte Übertragungsart beim Verwenden des \"An Reader übertragen\" "
 "Buttons"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maximale Anzahl der Arbeitsprozesse in der Warteschlange"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Dateien wählen"
 
@@ -4285,8 +4313,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Keine Bücher ausgewählt"
@@ -4483,7 +4511,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4549,7 +4577,7 @@ msgid "Bulk convert"
 msgstr "Auf einmal konvertieren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Konvertierung nicht möglich"
 
@@ -4557,7 +4585,7 @@ msgstr "Konvertierung nicht möglich"
 msgid "Starting conversion of %d book(s)"
 msgstr "Starte Konvertierung von %d Büchern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4738,7 +4766,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "eMail an"
 
@@ -4746,32 +4774,32 @@ msgstr "eMail an"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "An Reader übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4858,26 +4886,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Kann Metadaten nicht bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4885,7 +4913,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4897,7 +4925,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4908,19 +4936,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Nachrichten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Rufe Nachrichten ab von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " abgerufen."
 
@@ -4985,7 +5013,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Willkommens-Assistenten ausführen"
 
@@ -5233,7 +5261,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:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Keine Bücher"
 
@@ -5440,8 +5468,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Pfad"
 
@@ -5451,17 +5479,17 @@ msgstr "Pfad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5471,25 +5499,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Keine"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5547,7 +5575,7 @@ msgstr "Ausgabe"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5570,14 +5598,14 @@ msgstr "Ausgabe"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6151,10 +6179,14 @@ msgstr "Kein Inhal&tsverzeichnis am Anfang des Buches einfügen."
 msgid "FB2 Output"
 msgstr "FB2 Ausgabe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Schriftskalierungs-Assistent"
@@ -6757,7 +6789,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7353,21 +7385,21 @@ msgstr "Fehler"
 msgid "Error communicating with device"
 msgstr "Fehler bei der Kommunikation mit dem Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Keine geeigneten Formate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Fehler in der Kommunikation zum Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7375,68 +7407,68 @@ msgstr ""
 "Es trat ein Fehler in der Kommunikation mit dem Gerät auf. Bitte entfernen "
 "und schließen Sie das Gerät wieder an und - oder starten Sie neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Gerät: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "zum Übertragen ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 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:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Kein Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Übertragung schlug fehl: Kein Gerät verbunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Keine Speicherkarte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Sende Nachrichten an das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Sende Bücher an das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7445,11 +7477,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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Gerätespeicher voll"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7737,7 +7769,7 @@ msgstr "Format wählen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -7874,7 +7906,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7921,8 +7953,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7954,12 +7986,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -8151,22 +8183,22 @@ msgid "Working"
 msgstr "Bei der Arbeit..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Kleinschreibung"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Großschreibung"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Wortanfänge groß schreiben"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9667,12 +9699,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9741,7 +9773,7 @@ msgid "Send test mail from %s to:"
 msgstr "Test eMail senden von %s an:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -9988,63 +10020,63 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Nachrichten:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "eBook:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Im Anhang finden Sie das eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "von"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "im %s Format."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Sende eMail an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 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/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Nachrichten senden an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10058,67 +10090,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "R&egulärer Ausdruck"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Datei&name:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Titel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regulärer Ausdruck (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Kein Treffer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autoren:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Regulärer Ausdruck (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Reihen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regulärer Ausdruck (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Reihen Index:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regulärer Ausdruck (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regulärer Ausdruck (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10329,48 +10379,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Größe (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doppelklick ermöglicht <b>Bearbeitung</b><br><br>"
 
@@ -10447,7 +10497,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Keine Treffer</b> für die Suchworte <i>%s</i> gefunden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Keine Treffer gefunden"
 
@@ -10464,12 +10514,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF Viewer Symbolleiste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Nächste Seite"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Vorherige Seite"
 
@@ -11285,19 +11335,26 @@ msgstr "Als Voreinstellung verwenden"
 msgid "&Remove email"
 msgstr "eMail entfe&rnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Automatisches Übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "eMail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formate für eMail. Das erste passende Format wird versendet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11306,7 +11363,7 @@ msgstr ""
 "Adresse versendet (vorausgesetzt sie entspricht einem der angegebenen "
 "Formate)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "Neue eMail Adresse"
 
@@ -11318,94 +11375,94 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Mittel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Groß"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wäh&len (erfordert Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Symbol im Sys&tembereich der Kontrollleiste aktivieren (erfordert Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 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/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11414,22 +11471,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11439,64 +11496,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -12257,30 +12310,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12377,7 +12434,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Suche"
@@ -12470,166 +12527,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12639,60 +12696,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Übereinstimmung mit allen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Übereinstimmung mit irgendeinem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12769,24 +12826,24 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Misslungen</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -12797,11 +12854,11 @@ msgstr ""
 "verursachen.<br>\n"
 "                      Sind Sie sicher, dass sie beenden möchten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13005,7 +13062,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Einstellungen zum Anpassen des eBook Viewers"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Zuletzt verwendete Fenstergröße merken"
 
@@ -13085,36 +13142,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Gehe zu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -13192,75 +13249,75 @@ msgstr "Druckvorschau"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "eBook wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Keine Treffer gefunden für: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Lade Ablauf..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Lege %s an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Lesezeichen hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Titel für Lesezeichen eingeben:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Lesezeichen verwalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Lade eBook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Konnte eBook nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Einstellungen zur Kontrolle des eBook Viewers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Falls angegeben, dann wird das Viewer Fenster beim Start im Vordergrund "
 "angezeigt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Javascript Alarme und Konsolennachrichten auf der Konsole ausgeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13338,27 +13395,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr "eBook drucken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Groß-/Kleinschreibung ändern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Groß-/Kleinschreibung vertauschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14636,11 +14693,11 @@ msgstr ""
 "\n"
 "Sie erhalten Hilfe zu einem bestimmten Befehl mit: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14654,15 +14711,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migriere alte Datenbank zu eBook Bibliothek in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopiere <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Komprimiere Datenbank"
 
@@ -15729,102 +15786,102 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Nachrichtenquelle unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Download beendet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " von "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tFehlgeschlagene Verknüpfungen:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Rufe Feeds ab..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Feeds der Index Seite erhalten"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Versuche Umschlagbild zu laden..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Starte Download von [%d Thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Feeds wurden nach %s heruntergeladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Konnte Umschlagbild nicht laden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Lade Umschlagbild von %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Artikel ohne Titel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artikel geladen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Laden der Artikel schlug fehl: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Rufe Feed ab"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16655,9 +16712,6 @@ msgstr "Lade CSS Stylesheets nicht herunter."
 #~ "Option außer Gebrauch und wird bevorzugt behandelt. Um --font-delta zu "
 #~ "benutzen, geben Sie 0 an. Voreinstellung: %defaultpt"
 
-#~ msgid "Toolbar"
-#~ msgstr "Symbolleiste"
-
 #~ msgid "Show &text in toolbar buttons"
 #~ msgstr "Zeige &Text in Schaltflächen der Symbolleiste"
 
@@ -17459,6 +17513,9 @@ msgstr "Lade CSS Stylesheets nicht herunter."
 #~ msgid "Output:"
 #~ msgstr "Ausgabe:"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Kein gültiges Plugin gefunden in "
+
 #~ msgid " plugins"
 #~ msgstr " Plugins"
 
diff --git a/src/calibre/translations/nl.po b/src/calibre/translations/nl.po
index 7b08d24a19..9fdca8191a 100644
--- a/src/calibre/translations/nl.po
+++ b/src/calibre/translations/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-02 12:46+0000\n"
-"Last-Translator: Pieter Lexis <Unknown>\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-02 04:06+0000\n"
+"Last-Translator: Oscar Schrover <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: 2011-03-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-04-03 04:38+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Country: NETHERLANDS\n"
 "X-Poedit-Language: Dutch\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "Set metadata from %s files"
 msgstr "Stel metagegevens van %s bestanden in"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Doet helemaal niets"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -39,7 +39,7 @@ msgstr "Doet helemaal niets"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -56,9 +56,9 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -78,7 +78,7 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -124,19 +124,19 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -144,12 +144,12 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -160,11 +160,11 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -178,46 +178,46 @@ msgstr "Doet helemaal niets"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Basis"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Op maat maken"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Kan niet configureren"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Bestandstype"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
-msgstr "Metagegevens lezer"
+msgstr "Lezer etagegevens"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
-msgstr "Metagegevens schrijver"
+msgstr "Schrijver metagegevens"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Catalogusgenerator"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Actie in de gebruikersinterface"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Voorkeuren"
@@ -229,7 +229,7 @@ msgid ""
 "library."
 msgstr ""
 "Loop alle links na in een HTML-bestand en maak een ZIP-bestand aan met alle "
-"gelinkte bestanden. Telkens wanneer U een HTML-bestand toevoegt aan de "
+"gelinkte bestanden. Telkens wanneer je een HTML-bestand toevoegt aan de "
 "bibliotheek wordt deze plug-in geactiveerd."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:54
@@ -237,8 +237,8 @@ msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
 msgstr ""
-"Karaktercodering voor de invoer HTML-bestanden. Standaard keuzes zijn: "
-"cp1252, latin1, iso-8859-1 en utf-8."
+"Karaktercodering voor de HTML-invoerbestanden. Standaardkeuzes zijn: cp1252, "
+"latin1, iso-8859-1 en utf-8."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:61
 msgid ""
@@ -282,7 +282,7 @@ msgstr "Haal de omslag uit bestanden met stripverhalen"
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:395
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:406
 msgid "Read metadata from %s files"
-msgstr "lees de metagegevens van %s bestanden"
+msgstr "lees de metagegevens van %s-bestanden"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:343
 msgid "Read metadata from ebooks in RAR archives"
@@ -290,7 +290,7 @@ msgstr "Lees de metagegevens van ebooks in RAR archieven"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:417
 msgid "Read metadata from ebooks in ZIP archives"
-msgstr "Lees metagegevens van eboeken in ZIP-archieven"
+msgstr "Lees metagegevens van e-boeken in ZIP-archieven"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:430
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:440
@@ -299,7 +299,7 @@ msgstr "Lees metagegevens van eboeken in ZIP-archieven"
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:483
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:493
 msgid "Set metadata in %s files"
-msgstr "Stel metagegevens van %s bestanden in"
+msgstr "Stel metagegevens van %s-bestanden in"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:822
 msgid "Look and Feel"
@@ -325,7 +325,7 @@ msgstr "Gedrag"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:840
 msgid "Change the way calibre behaves"
-msgstr "Wijzig de manier waarop Calibre reageert"
+msgstr "Wijzig het gedrag van Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:845
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:218
@@ -334,23 +334,24 @@ msgstr "Voeg je eigen kolommen toe"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:851
 msgid "Add/remove your own columns to the calibre book list"
-msgstr "Voeg/Verwijder je eigen kolommen toe aan de calibre boekenlijst"
+msgstr ""
+"Voeg je eigen kolommen toe aan of schrap ze uit de calibre boekenlijst"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Gereedschapsbalk aanpassen"
+msgid "Toolbar"
+msgstr "Werkbalk"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
 "Customize the toolbars and context menus, changing which actions are "
 "available in each"
 msgstr ""
-"Pas de werkbalken en  contextmenu's aan en verander daarmee de beschikbare "
-"actie's in beide."
+"Pas de werkbalken en contextmenu's aan en verander daarmee de beschikbare "
+"acties in beide."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Zoekmethode aanpassen"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -385,7 +386,7 @@ msgstr "Uitvoeropties"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:907
 msgid "Set conversion options specific to each output format"
-msgstr "Set de conversieopties specifiek voor ieder uitvoerformaat"
+msgstr "Stel de conversieopties specifiek voor ieder uitvoerformaat in"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:912
 msgid "Adding books"
@@ -412,8 +413,8 @@ msgid ""
 "Control how calibre exports files from its database to disk when using Save "
 "to disk"
 msgstr ""
-"Bepaal hoe calibre bestanden uit zijn database op schijf bewaard als je "
-"Bewaar op schijf gebruikt"
+"Bepaal hoe calibre bestanden uit zijn database op schijf bewaart als je "
+"'Bewaar op schijf' gebruikt"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:936
 msgid "Sending books to devices"
@@ -421,7 +422,7 @@ msgstr "Stuur boeken naar apparaten"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:942
 msgid "Control how calibre transfers files to your ebook reader"
-msgstr "Bepaald hoe calibre de bestanden naar je ebook reader verstuurt"
+msgstr "Bepaald hoe calibre de bestanden naar je e-boeklezer verstuurt"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:948
 msgid "Metadata plugboards"
@@ -448,7 +449,7 @@ msgstr "Bepaal de eigenschappen van je sjabloon"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:970
 msgid "Sharing books by email"
-msgstr "Deel boeken via email"
+msgstr "Deel boeken via e-mail"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:972
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:984
@@ -460,7 +461,7 @@ msgid ""
 "Setup sharing of books via email. Can be used for automatic sending of "
 "downloaded news to your devices"
 msgstr ""
-"Configureer het delen van boeken via email. Dit kan gebruikt worden om "
+"Configureer het delen van boeken via e-mail. Dit kan gebruikt worden om "
 "automatisch gedownload nieuws naar je apparaten te sturen"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:982
@@ -472,18 +473,18 @@ msgid ""
 "Setup the calibre Content Server which will give you access to your calibre "
 "library from anywhere, on any device, over the internet"
 msgstr ""
-"Configureer de calibre Content Server, die je toegang tot je calibre "
-"bibliotheek geeft van overal, op elk apparaat, via het internet"
+"Configureer de calibre Content Server, die je toegang tot je "
+"calibrebibliotheek geeft van overal, op elk apparaat, via het internet"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:995
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:268
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Plug-ins"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1001
 msgid "Add/remove/customize various bits of calibre functionality"
 msgstr ""
-"Voeg toe/verwijder/of pas diverse onderdelen van calibre's werking  aan"
+"Voeg toe of verwijder diverse onderdelen van calibres werking of pas ze aan"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1007
 msgid "Tweaks"
@@ -503,7 +504,7 @@ msgstr "Diverse geavanceerde instellingen"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
-msgstr "Conversie Invoer"
+msgstr "Invoer van conversie"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:134
 msgid ""
@@ -519,7 +520,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:234
 msgid "Conversion Output"
-msgstr "Conversie Uitvoer"
+msgstr "Uitvoer van conversie"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:248
 msgid ""
@@ -539,15 +540,15 @@ msgid ""
 "This profile tries to provide sane defaults and is useful if you know "
 "nothing about the input document."
 msgstr ""
-"Dit profiel probeert te voorzien in leesbare resultaten en is handig als u "
-"niets over het invoer document weet."
+"Dit profiel probeert zinnige instellingen te gebruiken, en is handig als je "
+"niets over het invoerdocument weet."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:61
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:453
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/600/700 etc."
 msgstr ""
-"Dit profiel is bedoeld voor de SONY PRS modellen. De 500/505/600/700 etc."
+"Dit profiel is bedoeld voor de SONY PRS-modellen. De 500/505/600/700 etc."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:73
 msgid "This profile is intended for the SONY PRS 300."
@@ -566,7 +567,7 @@ msgstr "Dit profiel is bedoeld voor de Microsoft Reader."
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:101
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:549
 msgid "This profile is intended for the Mobipocket books."
-msgstr "Dit profiel is bedoeld voor de Mobipocket boeken."
+msgstr "Dit profiel is bedoeld voor boeken voor Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:114
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:562
@@ -624,7 +625,7 @@ msgid ""
 "devices."
 msgstr ""
 "Dit profiel probeert zinnige instellingen te gebruiken, en is handig om een "
-"document te maken dat op een computer of meedere apparaten gelezen wordt."
+"document te maken dat op een computer of meerdere apparaten gelezen wordt."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:278
 msgid ""
@@ -655,11 +656,11 @@ msgstr "Dit profiel is bedoeld voor de SONY PRS-300"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:502
 msgid "Suitable for use with any e-ink device"
-msgstr "Geschikt voor gebruik met ieder e-inkt apparaat"
+msgstr "Geschikt voor gebruik met ieder e-inktapparaat"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:509
 msgid "Suitable for use with any large screen e-ink device"
-msgstr "Geschikt voor gebruik met ieder e-inkt apparaat met een groot scherm"
+msgstr "Geschikt voor gebruik met ieder e-inktapparaat met een groot scherm"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:518
 msgid "This profile is intended for the 5-inch JetBook."
@@ -670,7 +671,7 @@ msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
 msgstr ""
-"Dit profiel is bedoeld voor de SONY PRS reeks. De 300/600 etc, in "
+"Dit profiel is bedoeld voor de SONY PRS-reeks. De 300/600 etc, in "
 "horizontale schermmodus. Vooral handig voor stripboeken."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:635
@@ -679,41 +680,37 @@ msgstr "Dit profiel is bedoeld voor de Amazon Kindle DX."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:712
 msgid "This profile is intended for the B&N Nook Color."
-msgstr "Dit profiel is voor de B&N Nook Color"
+msgstr "Dit profiel is bedoeld voor de B&N Nook Color"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:723
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Dit profiel is bedoeld voor het Sanda Bamboek."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Geïnstalleerde Plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
-msgstr "Binding voor bestandstype plug-ins"
+msgstr "Binding tussen bestandstype en plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
-msgstr "Lokale plug-in aanpassing"
+msgstr "Lokale plug-inaanpassing"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
-msgstr "Uitgeschakelde plugins"
+msgstr "Uitgeschakelde plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Ingeschakelde plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Geen geldige plugin gevonden in "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
-msgstr "Initialisatie van de plugin %s is mislukt met een traceback:"
+msgstr "Initialisatie van de plug-in %s is mislukt met een traceback:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -725,37 +722,37 @@ msgstr ""
 "    Pas calibre aan door externe plug-ins te laden.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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."
+"hij zich bevindt."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
-"Personaliseer plugin. Geef een naam van een plugin en personalisatie string "
+"Personaliseer plug-in. Geef een naam van een plug-in en personalisatiestring "
 "gescheiden met een komma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
-msgstr "Toon geïnstalleerde plugins"
+msgstr "Toon geïnstalleerde plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
-msgstr "Activeer de genoemde plugin"
+msgstr "Activeer de genoemde plug-in"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
-msgstr "Deactiveer de genoemde plugin"
+msgstr "Deactiveer de genoemde plug-in"
 
 #: /home/kovid/work/calibre/src/calibre/debug.py:150
 msgid "Debug log"
@@ -770,88 +767,100 @@ msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used"
 msgstr ""
-"Komma-gescheiden lijst van mappen om e-boeken naar toe te sturen op het "
-"apparaat. De eerste die wordt gevonden zal worden gebruikt."
+"Door komma's gescheiden lijst van mappen om e-boeken naar toe te sturen op "
+"het apparaat. De eerste map die wordt gevonden zal worden gebruikt."
 
 #: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:138
 msgid "Communicate with S60 phones."
 msgstr "Communiceert met S60 telefoons"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
-msgstr "Gebruik Series als categorie in iTunes / iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr "Gebruik reeks als categorie in iTunes / iBooks"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Cache omslagen van iTunes / iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple-apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Communiceer met iTunes / iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Apple apparaat gevonden, iTunes wordt gestart, even geduld…"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
-"Kan boeken niet direct copiëren van iDevice. Sleep van iTunes bibliotheek "
-"naar de de desktop, en voeg dan toe aan calibre's bibliotheek venster."
+"Kan boeken niet direct copiëren van iDevice. Sleep van iTunesbibliotheek "
+"naar de de desktop, en voeg dan toe aan het bibliotheekvenster van calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
-msgstr "Bijwerken van metagegevens opsomming op het apparaat…"
+msgstr "Bijwerken van lijst metagegevens op het apparaat…"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d van %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "voltooid"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
-"Sommige boeken niet gevonden in de iTunes database.\n"
+"Sommige boeken niet gevonden in de iTunes-database.\n"
 "Verwijder met behulp van de iBooks app.\n"
 "Klik op 'Details weergeven' voor een lijst."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -859,31 +868,31 @@ msgstr ""
 "Sommige omslagafbeeldingen konden niet worden omgezet.\n"
 "Klik op 'Details weergeven' voor een overzicht."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Nieuws"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catalogus"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Verbinden met iTunes."
 
@@ -897,7 +906,7 @@ msgstr "Li Fanxi"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:42
 msgid "Device IP Address (restart calibre after changing)"
-msgstr "Apparaat IP adres (herstart calibre na aanpassing)"
+msgstr "IP-adres van apparaat (herstart calibre na aanpassing)"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:47
 msgid ""
@@ -912,7 +921,7 @@ msgstr ""
 msgid ""
 "Unable to connect to Bambook, you need to install Bambook library first."
 msgstr ""
-"Niet in staat om verbinding te maken met Bambook, u moet allereerst de "
+"Niet in staat om verbinding te maken met Bambook, je moet allereerst de "
 "Bambook bibliotheek installeren."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:75
@@ -922,7 +931,7 @@ msgid ""
 "Bambook has been correctly configured."
 msgstr ""
 "Niet in staat om verbinding te maken met Bambook. \n"
-"Als u probeert verbinding te maken via Wi-Fi, zorg er dan alstublieft voor "
+"Als je probeert verbinding te maken via Wi-Fi, zorg er dan alstublieft voor "
 "dat het IP adres van Bambook correct is ingesteld."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:112
@@ -935,29 +944,29 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
-msgstr "Bezig met het ophalen van boeken van het apparaat..."
+msgstr "Bezig met het ophalen van boekenlijst van het apparaat..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
-msgstr "Bezig om de boeken naar het aparaat over te zetten..."
+msgstr "Bezig om de boeken naar het apparaat over te zetten..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:285
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Toevoegen boeken aan apparaat metagegevens lijst..."
 
@@ -967,8 +976,8 @@ msgstr "Toevoegen boeken aan apparaat metagegevens lijst..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Bezig om boeken te verwijderen van apparaat..."
 
@@ -976,23 +985,23 @@ msgstr "Bezig om boeken te verwijderen van apparaat..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Verwijderen boeken van apparaat metagegevens lijst..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Versturen van metagegevens naar apparaat..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK is niet geïnstalleerd."
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
-msgstr "Communiceer met de Binatone eBoek lezer."
+msgstr "Communiceer met de Binatone e-boeklezer."
 
 #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
@@ -1007,15 +1016,15 @@ 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 "Communiceer met de Cybook Gen 3 / Opus eboek lezer."
+msgstr "Communiceer met de Cybook Gen 3 / Opus e-boeklezer."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:64
 msgid "Communicate with the Cybook Orizon eBook reader."
-msgstr "Communiceer met de Cybook Orizon eBook reader."
+msgstr "Communiceer met de Cybook Orizon e-boeklezer."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:25
 msgid "Communicate with the EB600 eBook reader."
-msgstr "Communiceer met de EB600 e-boek lezer."
+msgstr "Communiceer met de EB600 e-boeklezer."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:193
 msgid "Communicate with the Astak Mentor EB600"
@@ -1043,7 +1052,7 @@ msgstr "Communiceert met de Entourage Edge."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
-msgstr "Communiceer met de ESlick e-boek lezer."
+msgstr "Communiceer met de ESlick e-boeklezer."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
 msgid "Communicate with the Sigmatek eBook reader."
@@ -1061,27 +1070,27 @@ msgstr "apparaat interface"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
 msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "Communiceer met Hanlin V3 eboek lezers."
+msgstr "Communiceer met Hanlin V3 e-boeklezers."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:96
 msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "Communiceer met Hanlin V5 eBoek lezers."
+msgstr "Communiceer met Hanlin V5 e-boeklezers."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:115
 msgid "Communicate with the BOOX eBook reader."
-msgstr "Communiceer met de BOOX eBoek lezer."
+msgstr "Communiceer met de BOOX e-boeklezer."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:133
 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."
+"Door komma's gescheiden lijst van mappen om e-boeken naar toe te sturen op "
+"het apparaat. De eerste map die wordt gevonden zal worden gebruikt."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:22
 msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "Communiceer met de Hanvon N520 eBoek lezer."
+msgstr "Communiceer met de Hanvon N520 e-boeklezer."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:47
 msgid "Communicate with The Book reader."
@@ -1178,7 +1187,7 @@ msgid ""
 msgstr ""
 "Paginanummering kan op twee manier gegenereerd worden. De betere generator "
 "maakt de paginanummering zoals deze in het geprinte boek opgenomen zijn, "
-"deze methode is echter langzamer en vertraagt het verzenden van bestanden "
+"deze methode is echter langzamer en vertraagt het versturen van bestanden "
 "naar de Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:257
@@ -1194,8 +1203,8 @@ msgid ""
 "The Kobo supports only one collection currently: the \"Im_Reading\" list.  "
 "Create a tag called \"Im_Reading\" "
 msgstr ""
-"De Kobo ondersteund slechts een verzameling op dit moment: de \"Im_Reading\" "
-"lijst. Maak een tag aan genaamd \"Im_Reading\" "
+"De Kobo ondersteunt slechts ëën collectie op dit moment: de 'Im_Reading' "
+"lijst. Maak een tag aan genaamd 'Im_Reading' "
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:468
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:383
@@ -1296,23 +1305,23 @@ msgstr "Communiceer met de Sony PRS-500 e-boek lezer."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Verbinden met alle Sony eBook readers."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Alle op titel"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Alle op auteur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
-"Komma gescheiden lijst van metagegevens velden om in collecties te "
+"Door komma's gescheiden lijst van metagegevensvelden om in collecties te "
 "veranderen op de lezer. Mogelijkheden onder andere: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1322,11 +1331,11 @@ msgstr ""
 "waarden toe aan de lijst om ze aan te zetten. De collecties zullen benoemd "
 "worden gebaseerd op het karakter na de \":\"."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Upload ikonen van boekomslagen afzonderlijk"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1335,42 +1344,53 @@ msgid ""
 "950 and newer."
 msgstr ""
 "Normaliter ziet de gebruiker van de Sony reader een weergave van de "
-"afbeelding van de omslag. Met deze optie, zal calibre een afzonderlijke "
-"omslag naar de reader sturen, wat van pas komt wanneer je DRMED boeken "
-"overzet waarvan je niet de omslag wijzigen kunt. Waarschuwing:  Deze optie "
+"afbeelding van de omslag. Met deze optie zal calibre een afzonderlijke "
+"omslag naar de reader sturen, wat van pas komt wanneer je DRMED-boeken "
+"overzet waarvan je de omslag niet wijzigen kan. Waarschuwing:  Deze optie "
 "kan slechts gebruikt worden bij de nieuwste Sony readers: 350, 650, 950 en "
 "nieuwer"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Ververs afzonderlijke omslagen wanneer automatisch management wordt gebruikt "
 "(nieuwste readers)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 "Stel deze optie in waneer afzonderlijke boekomslagen wordt opgeladen telkens "
-"wanneer U contact maakt met Uw apparaat. Schakel deze optie uit wanneer door "
-"een groot aantal boeken op uw reader de prestaties sterk teruglopen."
+"wanneer je contact maakt met je apparaat. Schakel deze optie uit wanneer "
+"door een groot aantal boeken op je reader de prestaties sterk teruglopen."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
-msgstr "Behoud boekomslag verhoudingen bij het maken van ikonen"
+msgstr "Behoud verhoudingen van boekomslag bij het maken van ikonen"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
-"Kies deze optie wanneer de ikonen dezelfde hoogte/breedte verhouding als de "
+"Kies deze optie wanneer de ikonen dezelfde hoogte-breedteverhouding als de "
 "omslag moeten krijgen."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1437,8 +1457,8 @@ msgid ""
 "Unable to detect the %s disk drive. Either the device has already been "
 "ejected, or your kernel is exporting a deprecated version of SYSFS."
 msgstr ""
-"Niet in staat om de %s harde schijf te detecteren. Of de schijf is "
-"uitgeworpen, of uw kernel is exporteert een verouderde versie van SYSFS."
+"Niet in staat om de harde schijf %s te detecteren. Of de schijf is "
+"uitgeworpen, of je kernel exporteert een verouderde versie van SYSFS."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:642
 msgid "Unable to mount main memory (Error code: %d)"
@@ -1449,13 +1469,13 @@ msgid ""
 "The main memory of %s is read only. This usually happens because of file "
 "system errors."
 msgstr ""
-"Het hoofdgeheugen van %s is alleen leesbaar. Dit gebeurt slechts vanwege "
-"systeem fouten."
+"Het hoofdgeheugen van %s is alleen-lezen. Dit gebeurt slechts vanwege "
+"systeemfouten."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:842
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
 msgid "The reader has no storage card in this slot."
-msgstr "De lezer heeft geen opslag kaart in dit slot."
+msgstr "De lezer heeft geen opslagkaart in dit slot."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:846
 msgid "Selected slot: %s is not supported."
@@ -1476,7 +1496,7 @@ msgstr "Apparaat configureren"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:55
 msgid "settings for device drivers"
-msgstr "Instellingen voor apparaat besturing drivers"
+msgstr "Instellingen voor drivers apparaatbesturing"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:57
 msgid "Ordered list of formats the device will accept"
@@ -1484,7 +1504,7 @@ msgstr "Gesorteerde lijst van formaten die de lezer ondersteunt"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:59
 msgid "Place files in sub directories if the device supports them"
-msgstr "Plaats bestanden in submappen als de lezer die ondersteunt"
+msgstr "Plaats bestanden in deelmappen als de lezer die ondersteunt"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
@@ -1493,7 +1513,7 @@ msgstr "Lees de metagegevens van de bestanden op de lezer"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:63
 msgid "Use author sort instead of author"
-msgstr "Gebruik de sortering op auteur instelling i.p.v. de auteur"
+msgstr "Gebruik de instelling 'sortering op auteur' i.p.v. 'auteur'"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:65
 msgid "Template to control how books are saved"
@@ -1505,11 +1525,11 @@ msgstr "Extra Persoonlijke instellingen"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:42
 msgid "Communicate with an eBook reader."
-msgstr "Communiceer met een e-boek lezer."
+msgstr "Communiceer met een e-boeklezer."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
-msgstr "Haal lezer informatie op..."
+msgstr "Haal informatie van lezer op..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:197
 msgid "Rendered %s"
@@ -1535,20 +1555,20 @@ msgid ""
 "of less than 256 may result in blurred text on your device if you are "
 "creating your comics in EPUB format."
 msgstr ""
-"Aantal kleuren voor grijstint afbeelding conversie. Standaard: %default. "
-"Waarden van minder dan 256 kunnen resulteren in wazige tekst op uw apparaat "
-"als de strips in EPUB formaat worden gemaakt."
+"Aantal kleuren voor omzetten grijstinten van afbeeldingen. Standaard: "
+"%default. Waarden van minder dan 256 kunnen resulteren in wazige tekst op je "
+"apparaat als de strips in EPUB formaat worden gemaakt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:277
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
-"Geen kleur normalisatie (contrast verbetering) voor afbeeldingen. Standaard: "
+"Geen kleurnormalisatie (contrastverbetering) voor afbeeldingen. Standaard: "
 "Nee (False)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:280
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
-msgstr "Behoudt afbeelding aspect ratio. Standaard is beeldvullend."
+msgstr "Behoudt verhoudingen van afbeelding. Standaard is beeldvullend."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:282
 msgid "Disable sharpening."
@@ -1559,20 +1579,20 @@ msgid ""
 "Disable trimming of comic pages. For some comics, trimming might remove "
 "content as well as borders."
 msgstr ""
-"Schakel afknippen van strip paginas uit. Voor sommige strips, afknippen kan "
+"Schakel afknippen van strippaginas uit. Voor sommige strips kan afknippen "
 "ook inhoud verwijderen samen met de marges."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:287
 msgid "Don't split landscape images into two portrait images"
-msgstr "Splits landscape afbeeldingen niet in twee portret afbeeldingen"
+msgstr "Splits landschapsafbeeldingen niet in twee portretafbeeldingen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:289
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
-"Behoudt aspect ratio en schaal afbeelding aan de hand van de schermhoogte "
-"als beeld breedte voor het bekijken in landscape modus."
+"Behoud verhouding van afbeelding en herschaal zodat schermhoogte overeenkomt "
+"met de beeldbreedte voor het bekijken als landschap."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:292
 msgid ""
@@ -1580,14 +1600,14 @@ msgid ""
 "split into portrait pages from right to left."
 msgstr ""
 "Gebruik voor rechts-naar-links publicaties zoals manga. Hierdoor worden "
-"landscape paginas gesplitst in portret paginas van rechts naar links."
+"landscapepagina's gesplitst in portretpaginas van rechts naar links."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:296
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
-"Activeer ontspikkelen. Verminderd spikkel ruis. Dit kan de verwerkingstijd "
+"Activeer ontspikkelen. Vermindert spikkelruis. Dit kan de verwerkingstijd "
 "flink verlengen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:299
@@ -1595,8 +1615,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 ""
-"Sorteer de bestanden in de comic niet alfabetisch op naam - gebruik de "
-"voldorde waarin ze zijn toegevoegd aan de comic."
+"Sorteer de bestanden in de strip niet alfabetisch op naam - gebruik de "
+"volgorde waarin ze zijn toegevoegd aan de strip."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:303
 msgid ""
@@ -1604,9 +1624,9 @@ msgid ""
 "experiment to see which format gives you optimal size and look on your "
 "device."
 msgstr ""
-"Het formaat waarnaar afbeeldingen in het gemaakte eboek worden "
-"geconverteerd. U kunt experimenteren om te zien welk formaat de optimale "
-"grootte en visuele resultaten op uw apparaat genereren."
+"Het formaat waarnaar afbeeldingen in het gemaakte e-boek worden "
+"geconverteerd. Je kan experimenteren om te zien welk formaat de optimale "
+"grootte en visuele resultaten op je apparaat genereren."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:307
 msgid "Apply no processing to the image"
@@ -1663,43 +1683,43 @@ msgid ""
 msgstr ""
 "Invoer_bestand uitvoer_bestand [opties]\n"
 "\n"
-"Converteer een eboek van het ene formaat naar het andere.\n"
+"Converteer een e-boek van het ene formaat naar het andere.\n"
 "\n"
 "Invoer_bestand is de invoer, en uitvoer_bestand is de uitvoer. Beiden moeten "
 "worden opgegeven als de eerste twee parameters van het commando.\n"
 "\n"
-"Het uitvoer eboek formaat wordt geraden aan de hand van de bestands extensie "
-"van uitvoer_bestand. Dit kan ook het speciale formaat .EXT zijn, waar EXT is "
-"de uitvoer bestand extensie is. In dit geal zal de naam van het uitvoer "
-"bestand worden afgeleid uit de naam van het invoer bestand. Bestandsnamen "
-"kunnen niet beginnen met een afbreekstreep (-). Als uitvoer_bestand geen "
-"extensie bevat, dan zat het worden behandeld als zijnde een folder, en een "
-"\"open eboek\" (OEB) bestaande uit HTML bestanden zal naar deze folder "
-"worden geschreven. Dit zijn de bestanden die normaal gesproken naar de "
-"uitvoer plugin zouden worden gestuurd.\n"
+"Het e-boekformaat voor uitvoer wordt geraden aan de hand van de "
+"bestandsextensie van uitvoer_bestand. uitvoer_bestand kan ook de vorm .EXT "
+"hebben, waar EXT de extensie van het uitvoerbestand is, zonder naam. In dit "
+"geval zal de naam van het uitvoerbestand worden afgeleid uit de naam van het "
+"invoerbestand. Bestandsnamen kunnen niet beginnen met een afbreekstreep (-). "
+"Als uitvoer_bestand geen extensie bevat, dan zat het worden behandeld als "
+"zijnde een map, en een 'open e-boek' (OEB) bestaande uit HTML-bestanden zal "
+"naar deze map worden geschreven. Dit zijn de bestanden die normaal gesproken "
+"naar de uitvoerplug-in zouden worden gestuurd.\n"
 "\n"
-"Na het opgeven dan de invoer en uitvoer bestanden kun je de conversie "
+"Na het opgeven van de invoer- en uitvoerbestanden kan je de conversie "
 "beinvloeden door diverse opties op te geven. De beschikbare opties hangen af "
-"van dzowel de invoer als uitvoer bestandstypen. Voor informatie, geeft zowel "
-"de invoer als uitvoer namen op, en gebruik de -h optie.\n"
+"van het type van zowel in- als uitvoerbestand. Voor meer informatie geef je "
+"de optie-h op, met de namen van zowel in- als uitvoerbestand.\n"
 "\n"
-"Voor volledige documentatie van het conversie systeem, zie\n"
+"Voor volledige documentatie van het conversiesysteem, zie\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:108
 msgid "INPUT OPTIONS"
-msgstr "INVOER OPTIES"
+msgstr "OPTIES INVOER"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:109
 msgid "Options to control the processing of the input %s file"
-msgstr "Opties om de bewerking van invoer bestand %s aan te passen"
+msgstr "Opties om de bewerking van invoerbestand %s aan te passen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:115
 msgid "OUTPUT OPTIONS"
-msgstr "UITVOER OPTIES"
+msgstr "OPTIES UITVOER"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:116
 msgid "Options to control the processing of the output %s"
-msgstr "Opties om de bewerking van uitvoer bestand %s aan te passen"
+msgstr "Opties om de bewerking van uitvoerbestand %s aan te passen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:130
 msgid "Options to control the look and feel of the output"
@@ -1712,7 +1732,7 @@ msgid ""
 "options."
 msgstr ""
 "Wijzig de tekst en structuur van het document m.b.v algemene patronen. "
-"Normaal uitgeschakeld. Gebruik %s om aan te zetten. Individuele akties "
+"Normaal uitgeschakeld. Gebruik %s om aan te zetten. Individuele acties "
 "kunnen uitgeschakeld worden m.b.v. de %s opties."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:153
@@ -1724,7 +1744,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:162
 msgid "Control auto-detection of document structure."
-msgstr "Beinvloed auto-detectie van de document structuur."
+msgstr "Beinvloed auto-detectie van de documentstructuur."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:172
 msgid ""
@@ -1732,9 +1752,9 @@ msgid ""
 "source file has a Table of Contents, it will be used in preference to the "
 "automatically generated one."
 msgstr ""
-"de automatische generatie van de inhoudsopgave. Standaard, als het invoer "
-"bestand een inhoudsopgave bevat, dan zal deze bij voorkeur worden gebruikt "
-"in plaats van de automatisch gegenereerde."
+"de automatische generatie van de inhoudsopgave. Standaard, als het "
+"invoerbestand een inhoudsopgave bevat, dan zal deze bij voorkeur worden "
+"gebruikt in plaats van de automatisch gegenereerde."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:182
 msgid "Options to set metadata in the output"
@@ -1742,7 +1762,7 @@ msgstr "Opties om metagegevens in te stellen voor de uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:185
 msgid "Options to help with debugging the conversion"
-msgstr "Opties om te helpen met het vinden van problemen met de conversie"
+msgstr "Opties om te helpen met het foutzoeken voor de conversie"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:211
 msgid "List builtin recipes"
@@ -1755,7 +1775,7 @@ msgstr "Uitvoer opgeslagen op"
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102
 msgid "Level of verbosity. Specify multiple times for greater verbosity."
 msgstr ""
-"Niveau van informatie. Speficeer meerdere malen voor meer informatie."
+"Niveau van informatie. Speficiceer meerdere malen voor meer informatie."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:109
 msgid ""
@@ -1763,9 +1783,9 @@ msgid ""
 "specified directory. Useful if you are unsure at which stage of the "
 "conversion process a bug is occurring."
 msgstr ""
-"Bewaar de uitvoer van verschillende stadia van de conversie lijn in de "
-"opgegeven folder. Handig als je er niet zeker van bent tijdens welke stap in "
-"het conversie proces een fout optreedt."
+"Bewaar de uitvoer van verschillende stadia van de conversielijn in de "
+"opgegeven map. Handig als je niet zeker weet tijdens welke stap in het "
+"conversieproces een fout optreedt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:118
 msgid ""
@@ -1774,10 +1794,10 @@ msgid ""
 "For example resolution dependent lengths (i.e. lengths in pixels). Choices "
 "are:"
 msgstr ""
-"Specificeer het invoer profiel. Het invoer profiel geeft het conversie "
-"systeem informatie over hoe de verscheidene informatie in het invoer "
-"document dient te worden geinterpreteerd. Bijvoorbeeld, resolutie-"
-"afhankelijke lengtes (bv. lengte in pixels). keuzes zijn:"
+"Specificeer het invoerprofiel. Het invoerprofiel geeft het conversiesysteem "
+"informatie over hoe de verscheidene informatie in het invoerdocument dient "
+"te worden geinterpreteerd. Bijvoorbeeld, resolutie-afhankelijke lengtes (bv. "
+"lengte in pixels). keuzes zijn:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:129
 msgid ""
@@ -1786,11 +1806,11 @@ 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 ""
-"Specificeer het uitvoer profiel. Het uitvoer profiel verteld het conversie "
-"systeem hoe het document het best geoptimaliseerd kan worden voor het "
-"betreffende apparaat. In sommige gevallen is een uitvoer profiel nodig om "
+"Specificeer het uitvoerprofiel. Het uitvoerprofiel vertelt het "
+"conversiesysteem hoe het document het best geoptimaliseerd kan worden voor "
+"het betreffende apparaat. In sommige gevallen is een uitvoerprofiel nodig om "
 "documenten te creëren die werken op een apparaat. Bijvoorbeeld EPUB voor de "
-"SONY lezer. Keuzes zijn:"
+"SONY-lezer. Keuzes zijn:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:140
 msgid ""
@@ -1799,11 +1819,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 ""
-"De basis letter grootte in pts. Alle letter grootten in het geproduceerde "
-"boek zullen worden herschaald gebaseerd op deze instellingen. Het kiezen van "
-"een grotere grootte maakt de letters in de uitvoer groter, en omgekeer. "
-"Standaard de basic letter grootte is gebaseerd op het u itvoer profiel dat "
-"gekozen is."
+"De basislettergrootte in pts. Alle lettergroottes in het geproduceerde boek "
+"zullen worden herschaald gebaseerd op deze instelling. Het kiezen van een "
+"grotere grootte maakt de letters in de uitvoer groter, en omgekeerd. "
+"Standaard de basislettergrootte gebaseerd op het uitvoerprofiel dat gekozen "
+"is."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:150
 msgid ""
@@ -1813,16 +1833,16 @@ msgid ""
 "algorithm uses these sizes to intelligently rescale fonts. The default is to "
 "use a mapping based on the output profile you chose."
 msgstr ""
-"Herleiden van CSS lettertype namen naar letter grootten in pts. Een "
-"voorbeeld setting is 12,12,14,16,18,20,22,24. Dit zijn de herleidingen voor "
-"de groottes xx-small tot xx-large, met de eind grootte voor enorme fonts. "
-"Het lettertype herschaling algorithme gebruikt deze letter groottes om de "
+"Herleiden van CSS-lettertypenamen naar lettergroottes in pts. Een voorbeeld "
+"van instelling is 12,12,14,16,18,20,22,24. Dit zijn de herleidingen voor de "
+"groottes xx-small tot xx-large, met de laatste grootte voor enorme fonts. "
+"Het algoritme voor lettertypeherschaling gebruikt deze lettergroottes om de "
 "letters intelligent aan te passen. Standaard worden de instellingen gebruikt "
-"van het uitvoer profiel dat je kiest."
+"van het uitvoerprofiel dat je kiest."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:162
 msgid "Disable all rescaling of font sizes."
-msgstr "Geen Herschaling van lettertypen."
+msgstr "Geen herschaling van lettertypen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:168
 msgid ""
@@ -1834,7 +1854,7 @@ msgid ""
 "you can achieve \"double spaced\" text by setting this to 240."
 msgstr ""
 "The minimale hoogte van een regel, als percentage van de berekende "
-"lettergrootte van het element. Calibre borgt dat ieder element een "
+"lettergrootte van het element. Calibre zorgt dat ieder element een "
 "regelhoogte heeft van op zijn minst deze instelling, onafhankelijk van wat "
 "het ingevoerde document specificeert. Zet op nul om te negeren. De "
 "standaardwaarde is 120%. Gebruik deze instelling liever dan de rechtstreekse "
@@ -1848,6 +1868,10 @@ msgid ""
 "cases, the minimum line height option is more useful. By default no line "
 "height manipulation is performed."
 msgstr ""
+"De lijnhoogte in pts. Regelt de vrije ruimte tussen opeenvolgende "
+"tekstregels. Geldt alleen voor elementen die hun eigen lijnhoogte niet "
+"bepalen. Meestal is het opgeven van de minimale lijnhoogte nuttiger. "
+"Standaard: geen bewerking van hoogte."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:194
 msgid ""
@@ -1857,10 +1881,10 @@ msgid ""
 "tables and present it in a linear fashion."
 msgstr ""
 "Sommige slecht-ontworpen documenten gebruiken tabellen om de layout van "
-"texkst op de pagina te beinvloeden. Wanneer deze documenten worden "
-"geconverteert dan hebben ze vaak tekst die langer is dan de pagina en andere "
-"vreemde vertoningen. Deze optie zal de inhoud uit te tabellen extraheren, en "
-"deze in een lineair formaat presenteren."
+"tekst op de pagina te beinvloeden. Wanneer deze documenten worden "
+"geconverteerd dan hebben ze vaak vreemde verschijnsels zoals tekst die "
+"langer is dan de pagina. Deze optie zal de inhoud uit de tabellen "
+"extraheren, en deze in een lineair formaat presenteren."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:204
 msgid ""
@@ -1868,9 +1892,9 @@ msgid ""
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
-"XPath expressie die alle tags specificeerd die dienen te worden toegevoegd "
+"XPath uitdrukking die alle tags specificeert die dienen te worden toegevoegd "
 "aan de inhoudsopgave op niveau één. Als dit is opgegeven, dan heeft het "
-"prioriteit over andere vormen van auto-detectie."
+"prioriteit over andere vormen van autodetectie."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213
 msgid ""
@@ -1878,9 +1902,9 @@ msgid ""
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
-"XPath expressie die alle tags specificeerd die dienen te worden toegevoegd "
+"XPath uitdrukking die alle tags specificeert die dienen te worden toegevoegd "
 "aan de inhoudsopgave op niveau twee. Iedere regel zal worden toegevoegd "
-"onder de vorige niveau één regel."
+"onder de vorige regel van niveau één."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:221
 msgid ""
@@ -1888,9 +1912,9 @@ msgid ""
 "of Contents at level three. Each entry is added under the previous level two "
 "entry."
 msgstr ""
-"XPath expressie die alle tags specificeerd die dienen te worden toegevoegd "
+"XPath uitdrukking die alle tags specificeert die dienen te worden toegevoegd "
 "aan de inhoudsopgave op niveau drie. Iedere regel zal worden toegevoegd "
-"onder de vorige niveau twee regel."
+"onder de vorige regel van niveau twee."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:229
 msgid ""
@@ -1898,8 +1922,8 @@ msgid ""
 "preference to the auto-generated one. With this option, the auto-generated "
 "one is always used."
 msgstr ""
-"Normaal gesproken, als het invoer bestand al een inhoudsopgave bevat, dan "
-"zal deze worden gebruikt in plaats van de auto-gegenereerde versie. Met deze "
+"Normaal gesproken wordt de inhoudsopgave van het invoerbestand gebruikt in "
+"plaats van een automatisch gegenereerde als de invoer deze bevat. Met deze "
 "optie zal de auto-gegenereerde versie altijd worden gebruikt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:237
@@ -1921,10 +1945,9 @@ msgid ""
 "is: %default. Links are only added to the TOC if less than the threshold "
 "number of chapters were detected."
 msgstr ""
-"Maximum aantal links toe te voegan aan de inhoudsopgave. Gebruik 0 om uit te "
-"schakelen. Standaard is: %default. Links worden alleen toegevougd aan de "
-"inhoudsopgave als minder dan het drempel number aan hoofdstukken werd "
-"gedetecteerd."
+"Maximaal aantal links toe te voegen aan de inhoudsopgave. Gebruik 0 om uit "
+"te schakelen. Standaard is: %default. Links worden alleen toegevougd aan de "
+"inhoudsopgave als minder dan dit aantal aan hoofdstukken werd gedetecteerd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:259
 msgid ""
@@ -1932,7 +1955,7 @@ msgid ""
 "regular expression. Matching entries and all their children are removed."
 msgstr ""
 "Verwijder regels uit de inhoudsopgave waarvan de titels overeenkomen met de "
-"opgegeven reguliere expressie. Overeenkomende regels en al hun kinderen "
+"opgegeven reguliere uitdrukking. Overeenkomende regels en al hun kinderen "
 "worden verwijderd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:270
@@ -1944,13 +1967,13 @@ msgid ""
 "detection, use the expression \"/\". See the XPath Tutorial in the calibre "
 "User Manual for further help on using this feature."
 msgstr ""
-"Een XPath expressie om hoofdstuk titels op te sporen. standaard word er "
-"gezocht naar <h1> of <h2> tags die de woorden \"chapter\", "
+"Een XPathuitdrukking om titels van hoofdstukken op te sporen. standaard "
+"wordt er gezocht naar <h1>- of <h2>-tags die de woorden \"chapter\", "
 "\"book\",\"section\" of \"part\" bevatten, evenals andere tags met "
-"class=\"chapter\". De gebruikte expressie moet evalueren naar een lijst van "
-"elementen. Om hoofdstuk herkenning uit te schakelen, gebruik de expressie "
-"\"/\". Zie de XPath handleiding in het calibre Gebruikers Handboek voor meer "
-"help betreffende deze functionaliteit."
+"class=\"chapter\". De gebruikte uitdrukking moet resulteren in een lijst van "
+"elementen. Om hoofdstukherkenning uit te schakelen, gebruik de uitdrukking "
+"\"/\". Zie de XPathhandleiding in het Gebruikershandboek van calibre voor "
+"meer hulp betreffende deze functionaliteit."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:284
 msgid ""
@@ -1960,10 +1983,11 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 "Specificeer hoe gedetecteerde hoofdstukken moeten worden gemarkeerd. Een "
-"waarde \"pagebreak\" zal pagine einden toevoegen voor nieuwe hoofdstukken. "
-"Een waarde \"rule\" zal een streep toevoegen voor hoofdstukken. een waarde "
-"\"none\" zal hoofdstuk markering uitschakelen, en een waarde \"both\" zal "
-"zowel pagina einden als strepen gebruiken om hoofdstukken te markeren."
+"waarde \"nieuwe pagina\" zal een nieuwe pagina beginnen voor nieuwe "
+"hoofdstukken. Een waarde \"horizontale lijn\" zal een streep toevoegen voor "
+"hoofdstukken. Een waarde \"geen\" zal hoofdstukmarkering uitschakelen, en "
+"een waarde \"beide\" zal zowel nieuwe pagina's als strepen gebruiken om "
+"hoofdstukken te markeren."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:294
 msgid ""
@@ -1971,15 +1995,15 @@ msgid ""
 "the style rules from the source file, so it can be used to override those "
 "rules."
 msgstr ""
-"Het pad naar of een CSS Stylesheet, of raw CSS. Deze CSS zal worden "
-"toegevoegd aan de style regels van het invoer bestand, zodat het kan worden "
+"Het pad naar of een CSS-Stylesheet, of raw CSS. Deze CSS zal worden "
+"toegevoegd aan de stijlregels van het invoerbestand, zodat het kan worden "
 "gebruikt om deze voorrang te geven"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:303
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
 msgstr ""
-"Een XPath expressie. Pagina overgangen worden ingevoegd voor de "
+"Een XPathuitdrukking. Paginaovergangen worden ingevoegd voor de "
 "gespecificeerde elementen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:309
@@ -1989,33 +2013,37 @@ msgid ""
 "margins. Sometimes, this can cause the removal of margins that should not "
 "have been removed. In this case you can disable the removal."
 msgstr ""
+"In sommige documenten worden voor elke alinea apart linker- en rechtermarges "
+"opgegeven. calibre tracht deze te verwijderen, maar soms worden daardoor "
+"marges verwijderd die niet weg mogen. In dit geval kan margeverwijdering "
+"afgezet worden."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:320
 msgid ""
 "Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
-"Zet de boven marge in pts. Standaard is %default. Let op: 72 pts is gelijk "
+"Zet de bovenmarge in pts. Standaard is %default. Let op: 72 pts is gelijk "
 "aan 1 inch"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:325
 msgid ""
 "Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
-"Zet de onder marge in pts. Standaard is %default. Let op: 72 pts is gelijk "
+"Zet de ondermarge in pts. Standaard is %default. Let op: 72 pts is gelijk "
 "aan 1 inch"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330
 msgid ""
 "Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
-"Zet de linker marge in pts. Standaard is %default. Let op: 72 pts is gelijk "
+"Zet de linkermarge in pts. Standaard is %default. Let op: 72 pts is gelijk "
 "aan 1 inch"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:335
 msgid ""
 "Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
-"Zet de rechter marge in pts. Standaard is %default. Let op: 72 pts is gelijk "
+"Zet de rechtermarge in pts. Standaard is %default. Let op: 72 pts is gelijk "
 "aan 1 inch"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:341
@@ -2026,10 +2054,10 @@ msgid ""
 "\"original\" (the default) does not change justification in the source file. "
 "Note that only some output formats support justification."
 msgstr ""
-"Pas de uitlijning van de tekst aan. De waarde \"links\" veranderd alle "
-"uitgelijnde tekst in de bron naar links uitgelijnde tekst (dat is, niet "
-"uitgelijnd). De waarde \"uitlijnen\" veranderd alle niet uitgelijnde tekst "
-"naar uitgelijnd. De waarde \"origineel\" (de initiële waarde) veranderd de "
+"Pas de uitlijning van de tekst aan. De waarde \"links\" verandert alle "
+"uitgelijnde tekst in de bron naar links uitgelijnde tekst (m.a.w., geen "
+"uitlijning. De waarde \"uitlijnen\" verandert alle niet uitgelijnde tekst "
+"naar uitgelijnd. De waarde \"origineel\" (de initiële waarde) verandert de "
 "uitlijning in het bronbestand niet. Merk op dat maar een beperkt aantal "
 "output-formaten uitlijnen ondersteunen."
 
@@ -2039,9 +2067,9 @@ msgid ""
 "1.5em. Spacing removal will not work if the source file does not use "
 "paragraphs (<p> or <div> tags)."
 msgstr ""
-"Verwijder witregels tussen paragrafen. Zet ook een indentatie van 1.5em op "
-"paragrafen. Witregels verwijderen werkt niet als het invoerbestand geen "
-"paragrafen gebruikt (<p> of <div> tags)."
+"Verwijder witregels tussen alinea's. Zet ook een indentatie van 1.5em op "
+"alinea's. Witregels verwijderen werkt niet als het invoerbestand geen "
+"alinea's gebruikt (<p> of <div> tags)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:358
 msgid ""
@@ -2049,9 +2077,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
-"Als calibre paragraaf witregels verwijderd, dan voegt het automatisch een "
-"indentatie toe om ervoor te zorgen dat paragrafen duidelijk zichtbaar zijn. "
-"Deze optie stelt de breedte van deze indentatie in."
+"Als calibre witregels tussen alinea's verwijdert, dan voegt het automatisch "
+"een indentatie toe om ervoor te zorgen dat alinea's duidelijk zichtbaar "
+"zijn. Deze optie stelt de breedte van deze indentatie in."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:365
 msgid ""
@@ -2066,16 +2094,16 @@ msgid ""
 "Insert a blank line between paragraphs. Will not work if the source file "
 "does not use paragraphs (<p> or <div> tags)."
 msgstr ""
-"Voeg een lege regel toe tussen paragrafen. Dit werkt niet als het invoer "
-"bestand geen paragrafen gebruikt (<p> of <div> tags)."
+"Voeg een lege regel toe tussen alinea's. Dit werkt niet als het invoer "
+"bestand geen alinea's gebruikt (<p> of <div> tags)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:378
 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 ""
-"Verwijder de eerste afbeelding uit het invoer boek. Handig als de eerste "
-"afbeelding van het invoer bestand een omslag afbeelding is, en een externe "
+"Verwijder de eerste afbeelding uit het invoerboek. Handig als de eerste "
+"afbeelding van het invoerbestand een omslagafbeelding is, en een externe "
 "omslag is opgegeven."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:386
@@ -2083,7 +2111,7 @@ 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 ""
-"Voeg metagegevens toe in aan het begin van het boek. Dit is handig als uw "
+"Voeg metagegevens toe aan het begin van het boek. Dit is handig als je "
 "eReader het weergeven/zoeken van metagegevens niet direct ondersteund."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:394
@@ -2100,8 +2128,8 @@ msgid ""
 "Read metadata from the specified OPF file. Metadata read from this file will "
 "override any metadata in the source file."
 msgstr ""
-"Lees metagegevens uit het opgegeven OPF bestand. Metagegevens die hier "
-"worden gelezen krijgt voorrang over metagegevens in het invoer bestand."
+"Lees metagegevens uit het opgegeven OPF-bestand. Metagegevens die hier "
+"worden gelezen krijgt voorrang over metagegevens in het invoerbestand."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:410
 msgid ""
@@ -2112,6 +2140,11 @@ msgid ""
 "by Chinese and Japanese for instance) the representation based on the "
 "current calibre interface language will be used."
 msgstr ""
+"Zet unicodekarakters om naar een ASCII-voorstelling. Voorzichtig "
+"gebruiken:zo zal bijvoorbeeld \"%s\" omgezet worden naar \"Mikhail "
+"Gorbachiov\". Merk ook op dat, als er meerdere voorstellingen zijn van een "
+"karakter (zoals bij karakters gemeen aan Chinees en Japans), de voorstelling "
+"gekozen wordt op basis van de taalinstelling voor de calibre-interface."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:425
 msgid ""
@@ -2122,12 +2155,12 @@ msgid ""
 "corresponding pair of normal characters. This option will preserve them "
 "instead."
 msgstr ""
-"Bewaar ligaturen aanwezig in het invoer document. Een ligatuur is een "
-"speciale weergave van een paar tekens zoals ff, fi, fl enz. De meeste lezers "
+"Bewaar ligaturen aanwezig in het invoerdocument. Een ligatuur is een "
+"speciale weergave van een tekenpaar zoals ff, fi, fl enz. De meeste lezers "
 "hebben geen ondersteuning voor ligaturen in hun standaard lettertypes, dus "
 "ze worden waarschijnlijk niet juist weergegeven. Standaard zal calibre een "
-"ligatuur om zetten in het overeenkomstige paar normale tekens. Deze optie "
-"zal ze in plaats daarvan behouden."
+"ligatuur omzetten in het overeenkomstige paar normale tekens. Deze optie zal "
+"ze in plaats daarvan behouden."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:437
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38
@@ -2137,8 +2170,8 @@ msgstr "Geef de titel op."
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "Set the authors. Multiple authors should be separated by ampersands."
 msgstr ""
-"Geef de auteurs op. Meerdere auteurs moete van elkaar worden gescheiden door "
-"het &-teken."
+"Geef de auteurs op. Meerdere auteurs moeten van elkaar worden gescheiden "
+"door het &-teken."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:446
 msgid "The version of the title to be used for sorting. "
@@ -2150,7 +2183,7 @@ msgstr "Regel te gebruiken bij het sorteren op auteur. "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:454
 msgid "Set the cover to the specified file or URL"
-msgstr "Stel de omslag in met het ingevoerde bestand of de URL"
+msgstr "Stel de omslag in met het opgegeven bestand of URL"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:458
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54
@@ -2165,12 +2198,12 @@ msgstr "Geef de uitgever op."
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:466
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:60
 msgid "Set the series this ebook belongs to."
-msgstr "Geef de serie op waar dit eboek toe behoort."
+msgstr "Geef de reeks op waar dit e-boek toe behoort."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:470
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62
 msgid "Set the index of the book in this series."
-msgstr "Geef de index van dit boek in de serie op."
+msgstr "Geef de index van dit boek in de reeks op."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:474
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64
@@ -2186,7 +2219,7 @@ msgstr "Geef het ISBN van het boek."
 #: /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 ""
-"Stel de labels voor het boek in. Dient komma gescheiden lijst te zijn."
+"Stel de labels voor het boek in. Dient lijst gescheiden door komma's te zijn."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70
@@ -2200,17 +2233,19 @@ msgstr "De taal instellen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:494
 msgid "Set the publication date."
-msgstr "Zet de publicatie datum."
+msgstr "Zet de publicatiedatum."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:498
 msgid "Set the book timestamp (used by the date column in calibre)."
-msgstr "Zet boek tijdstempel (voor de datum kolom in Calibre)."
+msgstr "Zet tijdstempel van boek (voor de datumkolom in Calibre)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:502
 msgid ""
 "Enable heuristic processing. This option must be set for any heuristic "
 "processing to take place."
 msgstr ""
+"Zet heuristische verwerking aan. Met deze optie uit wordt geen enkele "
+"heuristische verwerking uitgevoerd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:507
 msgid ""
@@ -2218,19 +2253,23 @@ msgid ""
 "h3 tags.  This setting will not create a TOC, but can be used in conjunction "
 "with structure detection to create one."
 msgstr ""
+"Detecteer niet-geformatteerde hoofdstukhoofdingen en deelhoofdingen. "
+"Verander ze in h2- en h3-tags. Deze optie genereert zelf geen inhoudsopgave, "
+"maar kan samen met structuurdetectie gebruikt worden om er een te maken"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:514
 msgid ""
 "Look for common words and patterns that denote italics and italicize them."
 msgstr ""
-"Zoek naar veelgebruikte woorden en patronen welke cursief zijn en maak deze "
-"cursief."
+"Zoek naar veelgebruikte woorden en patronen die cursief aanduiden en maak "
+"deze cursief."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:519
 msgid ""
 "Turn indentation created from multiple non-breaking space entities into CSS "
 "indents."
 msgstr ""
+"Maak van indentatie aangeduid door niet-splitsende witruimte CSS-indentatie."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:524
 msgid ""
@@ -2239,28 +2278,37 @@ msgid ""
 "the median line length.  If only a few lines in the document require "
 "unwrapping this value should be reduced"
 msgstr ""
+"Schaal om te bepalen tot welke lengte korte lijnen moeten worden "
+"aaneengeplakt. Geldige waarden zijn vlottendepuntgetallen tussen 0 en 1. "
+"Standaardwaarde is 0.4, iets minder dan de mediaan van de lijnlengte. Als "
+"maar weinig lijnen aan hun voorganger moeten geplakt worden neem je beter "
+"een kleinere waarde."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:532
 msgid "Unwrap lines using punctuation and other formatting clues."
-msgstr ""
+msgstr "Plak korte lijnen achter elkaar op basis van interpunctie e.d.m."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:536
 msgid ""
 "Remove empty paragraphs from the document when they exist between every "
 "other paragraph"
-msgstr ""
+msgstr "Verwijder lege alinea's als ze tussen alle andere alinea's voorkomen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:541
 msgid ""
 "Left aligned scene break markers are center aligned. Replace soft scene "
 "breaks that use multiple blank lines withhorizontal rules."
 msgstr ""
+"Links gealineëerde breaks (zoals ******) worden gecentreerd. Vervang "
+"opeenvolging van lege regels door een horizontale lijn."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:547
 msgid ""
 "Replace scene breaks with the specified text. By default, the text from the "
 "input document is used."
 msgstr ""
+"Vervang breaks door de aangegeven tekst. Standaard: gebruik de tekst uit het "
+"invoerbestand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:552
 msgid ""
@@ -2268,45 +2316,49 @@ msgid ""
 "used as a dictionary to determine whether hyphens should be retained or "
 "removed."
 msgstr ""
+"Analyseer gesplitste woorden. Het document zelf dient als woordenboek om te "
+"bepalen of het afbreekteken als liggend streepje moet worden behouden."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:558
 msgid ""
 "Looks for occurrences of sequential <h1> or <h2> tags. The tags are "
 "renumbered to prevent splitting in the middle of chapter headings."
 msgstr ""
+"Zoek naar opeenvolgende <h1>- of <h2>-tags. Deze worden hernummerd om te "
+"voorkomen dat hoofdstukhoofdingen opgedeeld worden."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:564
 msgid "Search pattern (regular expression) to be replaced with sr1-replace."
-msgstr ""
+msgstr "Zoekpatroon (regexp) dat vervangen moet worden door sr1."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:569
 msgid "Replacement to replace the text found with sr1-search."
-msgstr ""
+msgstr "Vervangtekst voor sr1."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:573
 msgid "Search pattern (regular expression) to be replaced with sr2-replace."
-msgstr ""
+msgstr "Zoekpatroon (regexp) dat vervangen moet worden door sr1."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:578
 msgid "Replacement to replace the text found with sr2-search."
-msgstr ""
+msgstr "Vervangtekst voor sr2."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:582
 msgid "Search pattern (regular expression) to be replaced with sr3-replace."
-msgstr ""
+msgstr "Zoekpatroon (regexp) dat vervangen moet worden door sr3."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:587
 msgid "Replacement to replace the text found with sr3-search."
-msgstr ""
+msgstr "Vervangtekst voor sr3."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:689
 msgid "Could not find an ebook inside the archive"
-msgstr "Geen ebook in archief gevonden"
+msgstr "Geen e-boek in archief gevonden"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:747
 msgid "Values of series index and rating must be numbers. Ignoring"
 msgstr ""
-"Waarden van de serie index en waarderingen moeten nummers zijn. Negeer"
+"Waarden van de reeks-index en waarderingen moeten nummers zijn. Ik negeer dit"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:754
 msgid "Failed to parse date/time"
@@ -2318,9 +2370,9 @@ msgstr "Converteer invoer naar HTML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:936
 msgid "Running transforms on ebook..."
-msgstr "Transformaties worden toegepast op eboek..."
+msgstr "Transformaties worden toegepast op e-boek..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Aanmaken"
 
@@ -2330,11 +2382,11 @@ msgstr "Bewerking mislukt: %s met fout: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:26
 msgid "ePub Fixer"
-msgstr "ePub correctie"
+msgstr "correctie ePub"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
 msgid "Workaround epubcheck bugs"
-msgstr "lapmiddel epubcheck fouten"
+msgstr "lapmiddel fouten epubcheck"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
 msgid ""
@@ -2347,8 +2399,7 @@ msgstr ""
 "rapporteert veel zaken als fout, die eigenlijk geen fouten zijn. epub-fix "
 "zal trachten om deze te detecteren en ze te vervangen door constructies waar "
 "epubcheck geen problemen mee heeft. Dit kan wel belangrijke veranderingen "
-"teweeg brengen in je epub bestand. Klachten hierover kan je best wenden tot "
-"het epubcheck project."
+"teweeg brengen in je epub-bestand. Klaag hierover bij het epubcheckproject."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:21
 msgid ""
@@ -2361,16 +2412,16 @@ msgid ""
 "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"
+"Herstelt eenvoudige problemen in EPUB-bestanden die ervoor kunnen zorgen dat "
+"ze geweigerd worden door slecht ontworpen publicatiediensten.\n"
 "\n"
 "Standaard worden geen herstellingen gemaakt en foutmeldingen worden "
-"weergegeven voor iedere gevonden fout. Gebruik de opties om in te "
-"controleren welke fouten automatisch hersteld worden."
+"weergegeven voor iedere gevonden fout. Gebruik de opties om te controleren "
+"welke fouten automatisch hersteld worden."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:52
 msgid "You must specify an epub file"
-msgstr "U dient een epub bestand te specifieren."
+msgstr "Je moet een EPUB-bestand specifieren."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
 msgid "Fix unmanifested files"
@@ -2382,8 +2433,8 @@ msgid ""
 "delete them as specified by the delete unmanifested option."
 msgstr ""
 "Herstel ontbrekende bestanden in het manifest. epub-fix kan deze toevoegen "
-"aan het manifest of ze wissen zoals gespecifieerd door de functie wis "
-"bestanden die niet in het manifest zijn opgenomen."
+"aan het manifest of ze wissen zoals gespecificeerd door de functie \"wis "
+"bestanden die niet in het manifest zijn opgenomen\"."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
 msgid "Delete unmanifested files instead of adding them to the manifest"
@@ -2396,9 +2447,8 @@ 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 ""
-"Extraheer de inhoud van eht gegenereerde EPUB bestand in de opgegeven "
-"folder. De inhoud van de folder zal eerst worden verwijderd, dus wees "
-"voorzichtig."
+"Extraheer de inhoud van het gegenereerde EPUB-bestand in de opgegeven map. "
+"De inhoud van de map zal eerst worden verwijderd, dus wees voorzichtig."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
 msgid ""
@@ -2408,12 +2458,12 @@ msgid ""
 "if your source file contains a very large number of page breaks, you should "
 "turn off splitting on page breaks."
 msgstr ""
-"Deactiveer het splitsen op pagina eind. Normaal gesproken invoer bestanden "
-"worden automatisch opgesplitst in twee bestanden bij iedere pagina einde. "
-"Dit resulteert in een eboek bestand dat sneller verwerkt kan worden met "
-"minder werk voor het systeem. Echter, het splitsen zelf is langzaam, en als "
-"je bronbestand een groot aantal pagina's bevat dan kun je deze splitsing "
-"uitschakelen."
+"Deactiveer het splitsen op het einde van een pagina. Normaal gesproken "
+"worden invoerbestanden automatisch opgesplitst in twee bestanden bij iedere "
+"nieuwe pagina. Dit resulteert in een e-boekbestand dat sneller verwerkt kan "
+"worden met minder werk voor het systeem. Echter, het splitsen zelf is "
+"langzaam, en als je bronbestand een groot aantal pagina's bevat dan kan je "
+"deze splitsing uitschakelen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73
 msgid ""
@@ -2421,8 +2471,8 @@ msgid ""
 "most EPUB readers cannot handle large file sizes. The default of %defaultKB "
 "is the size required for Adobe Digital Editions."
 msgstr ""
-"Splits alle HTML bestanden groter dan deze grootte (in KB). Dit is "
-"noodzakelijn omdat de meeste EPUB lezers niet met grote bestanden overweg "
+"Splits alle HTML-bestanden groter dan deze grootte (in KB). Dit is "
+"noodzakelijk omdat de meeste EPUB-lezers niet met grote bestanden overweg "
 "kunnen. De standaard van %defaultKB is de grootte die nodig is voor Adobe "
 "Digital Editions."
 
@@ -2432,9 +2482,9 @@ msgid ""
 "default cover is generated with the title, authors, etc. This option "
 "disables the generation of this cover."
 msgstr ""
-"Normaal gesproken, als het invoer bestand geen omslag afbeelding bevat en er "
-"niet expliciet een is opgegeven, dan zal er een standaard omslag worden "
-"gegenereert met daarop de titel, auteurs, etc.  Deze optie schakelt dit uit."
+"Normaal gesproken zal een standaardomslag worden aangemaakt met daarop de "
+"titel, auteurs, etc., als het invoerbestand geen omslagafbeelding bevat en "
+"er niet expliciet een is opgegeven. Deze optie schakelt dit uit."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
 msgid ""
@@ -2443,7 +2493,7 @@ msgid ""
 "JetBook Lite. Without this option, such devices will display the cover as a "
 "blank page."
 msgstr ""
-"Gebruik geen SVG voor de omslag van het boek. Gebruik deze optie als uw EPUB "
+"Gebruik geen SVG voor de omslag van het boek. Gebruik deze optie als je EPUB "
 "gebruikt gaat worden op een apparaat dat  SVG niet ondersteunt, zoals de "
 "iPhone of de JetBook Lite. Zonder deze optie, zullen deze apparaten de "
 "omslag van het boek als een lege pagina laten zien."
@@ -2456,12 +2506,12 @@ 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 ""
-"Bij gebruik van een SVG hoes, zal deze optie ervoor zorgen dat de hoes het "
-"hele scherm zal bedekken, maar toch de aspect ratio (verhouding van breedte "
-"en hoogte) zal behouden. Dit betekent dat er sprake kan zijn van hoezen met "
-"witte randen aan de zijkanten of de boven-en onderkant van het beeld, maar "
-"het beeld zal nooit worden verstoord. Zonder deze optie kan het beeld "
-"enigszins worden verstoord, maar er zullen geen randen zijn."
+"Bij gebruik van een SVG-hoes, zal deze optie ervoor zorgen dat de hoes het "
+"hele scherm zal bedekken, maar toch de breedte/hoogteverhouding zal "
+"behouden. Dit betekent dat er sprake kan zijn van hoezen met witte randen "
+"aan de zijkanten of de boven-en onderkant van het beeld, maar het beeld zal "
+"nooit worden verstoord. Zonder deze optie kan het beeld enigszins worden "
+"verstoord, maar er zullen geen randen zijn."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:105
 msgid ""
@@ -2469,6 +2519,9 @@ msgid ""
 "will flatten the file system inside the EPUB, putting all files into the top "
 "level."
 msgstr ""
+"Deze optie is alleen nodig als je de EPUB wil gebruiken met FBReaderJ. Het "
+"verwijdert alle deelmappen binnen de EPUB, en zet alle bestanden op het "
+"hoogste niveau."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:184
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:206
@@ -2479,7 +2532,7 @@ msgstr "Start"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Voeg geen inhoudsopgave toe aan het begin van het boek."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2489,13 +2542,24 @@ msgid ""
 "\"Table of Contents\" settings (turn on \"Force use of auto-generated Table "
 "of Contents)."
 msgstr ""
+"Specificeer het indelen in paragrafen. De waarde \"niets\" maakt van het "
+"boek ëën paragraaf. De waarde \"bestanden\" maakt van elk bestand een "
+"paragraaf; doe dit als je lezer problemen heeft. De waarde \"Inhoudsopgave\" "
+"maakt van elke ingang in de inhoudsopgave een titel en maakt paragrafen. Als "
+"dit niet goed werk dien je de instellingen voor \"Structuurdetectie\" en/of "
+"\"Inhoudsopgave\" aan te passen (zet \"Forceer gebruik van auto-gegenereerde "
+"inhoudsopgave\" aan)."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
 
 #: /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 ""
-"Volg links in HTML bestanden eerst in de breedte  Normaal gesproken zullen "
+"Volg links in HTML-bestanden eerst in de breedte. Normaal gesproken zullen "
 "ze eerst in de diepte worden gevolgd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:255
@@ -2504,9 +2568,9 @@ msgid ""
 "negative. 0 implies that no links in the root HTML file are followed. "
 "Default is %default."
 msgstr ""
-"Maximale recursie diepte bij het volgen van links in HTML bestanden. Kan "
-"niet negatief zijn.  0 geeft aan dat geen links in het kern HTML bestand "
-"zijn toegestaan. Standaard is %default."
+"Maximale recursiediepte bij het volgen van links in HTML-bestanden. Kan niet "
+"negatief zijn. 0 geeft aan dat geen links in het basis-HTML-bestand zijn "
+"toegestaan. Standaard is %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:264
 msgid ""
@@ -2515,32 +2579,32 @@ msgid ""
 "can result in various nasty side effects in the rest of of the conversion "
 "pipeline."
 msgstr ""
-"Normaal gesproken herschikt deze invoer plugin alls invoer bestanden in een "
-"standaard folder hierarchie. Gebruik deze optie alleen als je weet wat je "
+"Normaal gesproken herschikt deze invoerplug-in alle invoerbestanden in een "
+"standaardhiërarchie van mappen. Gebruik deze optie alleen als je weet wat je "
 "doet, omdat het kan resulteren in verscheidene rommelige effecten met de "
-"rest van het conversie systeem"
+"rest van het conversiesysteem"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/output.py:33
 msgid "CSS file used for the output instead of the default file"
 msgstr ""
-"CSS bestand dat gebruikt word voor de output in plaats van het standaard "
-"bestand"
+"CSS-bestand dat gebruikt word voor de output in plaats van het "
+"standaardbestand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/output.py:36
 msgid ""
 "Template used for generation of the html index file instead of the default "
 "file"
 msgstr ""
-"Gebruikte template voor het maken van een html-indexbestand in plaats van "
-"het standaard bestand"
+"Sjabloon gebruikt voor het maken van een html-indexbestand in plaats van het "
+"standaardbestand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/output.py:39
 msgid ""
 "Template used for the generation of the html contents of the book instead of "
 "the default file"
 msgstr ""
-"Gebruikte template voor het maken van de html inhoud van het book in plaats "
-"van het standaard bestand"
+"Sjabloon gebruikt voor het maken van de html-inhoud van het boek in plaats "
+"van het standaardbestand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/output.py:42
 msgid ""
@@ -2552,15 +2616,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
-msgstr "Aanmaken LIT bestand van EPUB..."
+msgstr "Aanmaken LIT-bestand van EPUB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
-msgstr "\tBook Designer bestand herkend."
+msgstr "\tBook Designer-bestand herkend."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
-msgstr "\tLezen HTML"
+msgstr "\tLezen HTML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
@@ -2572,16 +2636,16 @@ msgstr "Schrijf pre-info HTML naar "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
-msgstr "Verwerking %s"
+msgstr "Verwerken %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
-msgstr "\tConveteer naar BBEB..."
+msgstr "\tConverteer naar 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 "Kan bestand niet parseren: %s"
+msgstr "Kan bestand niet parsen: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
@@ -2589,7 +2653,7 @@ msgstr "%s is een leeg bestand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
-msgstr "Link %s %s kan niet worden geparseerd"
+msgstr "Link %s %s kan niet worden geparset"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
@@ -2601,7 +2665,7 @@ msgstr "Niet mogelijk om afbeelding %s te verwerken. Foutmelding: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
-msgstr "Niet mogelijk om interlaced PNG bestand %s te verwerken."
+msgstr "Niet mogelijk om interlaced PNG-bestand %s te verwerken."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
 msgid ""
@@ -2615,7 +2679,7 @@ msgstr ""
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
-"Een fout is opgetreden tijdens het verwerken van een tabel: %s. Tabel opmaak "
+"Een fout is opgetreden tijdens het verwerken van een tabel: %s. Tabelopmaak "
 "zal worden genegeerd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
@@ -2632,7 +2696,7 @@ msgstr "Tabel heeft een cel die te groot is."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
-msgstr "Omslag afbeelding kan niet worden ingelezen: %s"
+msgstr "Omslagafbeelding kan niet worden ingelezen: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
@@ -2640,7 +2704,7 @@ msgstr "Kan niet lezen van: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
-msgstr "Verwerking van OPF bestand is niet gelukt."
+msgstr "Verwerking van OPF-bestand is niet gelukt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136
 msgid ""
@@ -2648,11 +2712,11 @@ msgid ""
 "Convert an LRF file into an LRS (XML UTF-8 encoded) file"
 msgstr ""
 "%prog boek.lrf\n"
-"Converteer een LRF bestand naar een LRS bestand (XML UTF-8 codering)"
+"Converteer een LRF-bestand naar een LRS-bestand (XML UTF-8-codering)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
-msgstr "Doel LRS bestand"
+msgstr "Doel LRS-bestand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
 msgid "Do not save embedded image and font files to disk"
@@ -2660,11 +2724,11 @@ msgstr "Bewaar toegevoegde afbeeldingen en lettertypes niet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
-msgstr "Parsering LRF..."
+msgstr "Parsen van LRF..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
-msgstr "Creatie XML"
+msgstr "Creëren XML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
@@ -2680,16 +2744,16 @@ msgid ""
 "Compile an LRS file into an LRF file."
 msgstr ""
 "%prog [opties] bestand.lrs\n"
-"Compileer een LRS bestand naar LRF formaat."
+"Compileer een LRS-bestand naar LRF-formaat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
-msgstr "Pad naar doel bestand"
+msgstr "Pad naar doelbestand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:290
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:126
 msgid "Verbose processing"
-msgstr "uitgebreide verwerking"
+msgstr "Verwerking met veel uitleg"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
 msgid "Convert LRS to LRS, useful for debugging."
@@ -2697,7 +2761,7 @@ msgstr "converteer LRS naar LRF, handig om fouten op te sporen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
-msgstr "Foutief LRF bestand. Metagegevens kunnen niet worden ingesteld."
+msgstr "Foutief LRF-bestand. Metagegevens kunnen niet worden ingesteld."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
@@ -2710,16 +2774,16 @@ msgstr ""
 "%prog [opties] mijnboek.lrf\n"
 "\n"
 "\n"
-"Weergave/wijzig de metagegevens in een LRF bestand\n"
+"Toon/wijzig de metagegevens in een LRF-bestand\n"
 "\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
 msgid "Set the book title"
-msgstr "Geef boek titel"
+msgstr "Geef boektitel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
 msgid "Set sort key for the title"
-msgstr "Geef sorteer sleutel voor de titel"
+msgstr "Geef sorteersleutel voor de titel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
 msgid "Set the author"
@@ -2727,11 +2791,11 @@ msgstr "Geef de auteur"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
 msgid "Set sort key for the author"
-msgstr "Geef sorteer sleuter voor de auteur"
+msgstr "Geef sorteersleutel voor de auteur"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:597
 msgid "The category this book belongs to. E.g.: History"
-msgstr "De categorie waarin die boek behoord, bv: Geschiedenis"
+msgstr "De categorie waartoe dit boek behoord, bv: Geschiedenis"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:600
 msgid "Path to a graphic that will be set as this files' thumbnail"
@@ -2743,12 +2807,12 @@ msgstr ""
 msgid ""
 "Path to a txt file containing the comment to be stored in the lrf file."
 msgstr ""
-"Pad naar een TXT bestand met daarin de opmerking die zal worden opgeslagen "
-"in het LRF bestand."
+"Pad naar een TXT-bestand met daarin de opmerking die zal worden opgeslagen "
+"in het LRF-bestand."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
 msgid "Extract thumbnail from LRF file"
-msgstr "Lees pictogram uit LRF bestand"
+msgstr "Lees pictogram uit LRF-bestand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608
 msgid "Set the publisher"
@@ -2756,27 +2820,27 @@ msgstr "Geef de uitgever op"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
 msgid "Set the book classification"
-msgstr "Geef de boek classificatie op"
+msgstr "Geef de classificatie van het boek op"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:610
 msgid "Set the book creator"
-msgstr "Geef de boek maker op"
+msgstr "Geef de maker van het boek op"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
 msgid "Set the book producer"
-msgstr "Geef de boek producent op"
+msgstr "Geef de boekproducent op"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:613
 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 ""
-"Lees de omslag uit LRF bestand. Het LRF bestands formaat heeft geen "
+"Lees omslag uit LRF-bestand. Het LRF-bestandsformaat heeft geen "
 "gedefinieerde omslag, dus moeten we proberen deze te raden."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:615
 msgid "Set book ID"
-msgstr "Geef boek ID"
+msgstr "Geef ID boek"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:90
 msgid "Enable autorotation of images that are wider than the screen width."
@@ -2784,11 +2848,11 @@ msgstr "Roteer plaatjes die breder zijn dan het scherm automatisch."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
 msgid "Set the space between words in pts. Default is %default"
-msgstr "Zet de spatie ruimte tussen woorden in pts. Standaard is %default"
+msgstr "Zet de spatieruimte tussen woorden in pts. Standaard is %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 "Voeg een kopregel toe aan alle pagina's met de titel en de auteur."
+msgstr "Voeg aan alle pagina's een kopregel toe met de titel en de auteur."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:100
 msgid ""
@@ -2800,22 +2864,23 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104
 msgid "Add extra spacing below the header. Default is %default pt."
-msgstr "Voeg extra spatiëring toe onder de header. STandaard is %default pt."
+msgstr ""
+"Voeg extra spatiëring toe onder de kopregel. Standaard is %default pt."
 
 #: /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 paragraaf indentatie (De indentatie van de eerste regel in een "
-"paragraaf) in pts. Standaard: %default"
+"Minimale alinea-indentatie (De indentatie van de eerste regel in een alinea) "
+"in pts. Standaard: %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 ""
-"Genereer HTML tabellen als afbeeldingen. (Handig als het document grote of "
+"Genereer HTML-tabellen als afbeeldingen. (Handig als het document grote of "
 "gecompliceerde tabellen bevat)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:117
@@ -2823,20 +2888,20 @@ msgid ""
 "Multiply the size of text in rendered tables by this factor. Default is "
 "%default"
 msgstr ""
-"Vermenigvuldig de tekst grootte in gegenereerde tabellen bij deze waarde. "
+"Vermenigvuldig de tekstgrootte in gegenereerde tabellen met deze waarde. "
 "Standaard is %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
-msgstr "De serif lettertype familie om toe te voegen"
+msgstr "De familie met schreef om toe te voegen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
-msgstr "De sand-serif familie om toe te voegen"
+msgstr "De sand-seriffamilie om toe te voegen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
-msgstr "De monospace familie om toe te voegen"
+msgstr "De monospacefamilie om toe te voegen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
@@ -2876,10 +2941,9 @@ msgid ""
 msgstr ""
 "        %prog [options]\n"
 "\n"
-"        Haal metagegevens van Amazon. Je moet het opgeven als titel, "
-"auteur,\n"
-"        ISBN, uitgever of sleutelwoorden. Zal een maximum van 10 treffers "
-"ophalen,\n"
+"        Haal metagegevens van Amazon. Je moet ofwel titel, auteur,\n"
+"        ISBN, uitgever of sleutelwoorden opgeven. Zal een maximum van 10 "
+"treffers ophalen,\n"
 "        dus je moet je zoeksleutel zo specifiek mogelijk maken.\n"
 "        Je kunt de taal kiezen voor de metagegevens:\n"
 "        Alle, & Engels & Frans & Duits & Spaans\n"
@@ -2890,112 +2954,112 @@ msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
 msgstr ""
-"Pak archiefbestanden(zip/rar) met standaard ebook-formaten uit. Check ook of "
-"het cbr/cbz bestanden zijn."
+"Pak archiefbestanden(zip/rar) met standaard e-boekformaten uit. Check ook of "
+"het cbr/cbz-bestanden zijn."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:117
 msgid "TEMPLATE ERROR"
-msgstr "TEMPLATE FOUT"
+msgstr "SJABLOONFOUT"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Nee"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Ja"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Uitgeverij"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Opmerkingen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Labels"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
-msgstr "Serie"
+msgstr "Reeks"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Taal"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Tijdsaanduiding"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Gepubliceerd"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Rechten"
 
@@ -3017,16 +3081,15 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 "\n"
-"Lees/Schrijf metagegevens van/naar eboek bestanden.\n"
+"Lees/Schrijf metagegevens van/naar e-boekbestanden.\n"
 "\n"
 "Ondersteunde formaten voor het lezen van metagegevens: %s\n"
 "\n"
 "Ondersteunde formaten voor het schrijven van metagegevens: %s\n"
 "\n"
-"Verschillende bestandstypen ondersteunden verschillende soorten "
-"metagegevens. Als je probeert sommige metagegevens in te stellen op een "
-"bestandstype die dat niet ondersteund, dan zullen deze metagegevens "
-"genegeerd worden.\n"
+"Verschillende bestandstypes ondersteunen verschillende soorten metagegevens. "
+"Als je probeert sommige metagegevens in te stellen op een bestandstype dat "
+"dat niet ondersteund, dan zullen deze metagegevens genegeerd worden.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:40
 msgid ""
@@ -3034,14 +3097,14 @@ msgid ""
 "Author names should be in the order Firstname Lastname."
 msgstr ""
 "Geef de auteurs op. Meerdere auteurs moeten worden gescheiden met het &-"
-"teken. Auteur namen moeten in de volgorde Achternaam Voornaam zijn."
+"teken. Auteursnamen moeten in de volgorde Achternaam Voornaam zijn."
 
 #: /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 ""
-"de versie van de titel die word gebruikt bij het sorteren. Als deze leeg is "
+"de versie van de titel die wordt gebruikt bij het sorteren. Als deze leeg is "
 "en de titel is opgegeven, dan zal deze automatisch worden gegenereerd aan de "
 "hand van de titel."
 
@@ -3050,7 +3113,7 @@ 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 ""
-"Regel die word gebruikt bij het sorteren op auteur. Als deze leeg is, en de "
+"Regel die wordt gebruikt bij het sorteren op auteur. Als deze leeg is, en de "
 "auteur(s) zijn opgegeven, dan zal deze automatisch worden gegenereerd aan de "
 "hand van de auteur(s)."
 
@@ -3060,7 +3123,7 @@ msgstr "Gebruik het opgegeven bestand voor de omslag"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
-msgstr "Geef de boek catagorie op."
+msgstr "Geef de boekcategorie op."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
@@ -3069,14 +3132,14 @@ msgstr "Zet de publicatiedatum."
 #: /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 ""
-"Haal de omslag van het eboek en sla deze op in het opgegeven bestandsformaat"
+"Haal de omslag van het e-boek en sla deze op in het opgegeven bestandsformaat"
 
 #: /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 ""
-"Geef de naam van een OPF bestand op. De metagegevens zullen in het OPF "
+"Geef de naam van een OPF-bestand op. De metagegevens zullen in het OPF "
 "bestand worden opgeslagen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:83
@@ -3085,14 +3148,14 @@ msgid ""
 "ebook. Metadata specified on the command line will override metadata read "
 "from the OPF file"
 msgstr ""
-"Lees metagegevens uit het opgegeven OPF bestand en gebruik deze om de "
-"metagegevens in het eboek in te stellen. Metagegevens opgegeven op de "
-"commando regel hebben voorrang boven de metagegevens die zich in het OPF "
+"Lees metagegevens uit het opgegeven OPF-bestand en gebruik deze om de "
+"metagegevens in het e-boek in te stellen. Metagegevens opgegeven op de "
+"commandoregel hebben voorrang boven de metagegevens die zich in het OPF-"
 "bestand bevinden."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
-msgstr "Zet het BookID in LRF bestanden"
+msgstr "Zet het BookID in LRF-bestanden"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
@@ -3112,7 +3175,7 @@ msgstr "OPF gemaakt in"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
-msgstr "omslag weggeschreven naar"
+msgstr "Omslag weggeschreven naar"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
@@ -3121,7 +3184,7 @@ msgstr "Geen omslag gevonden"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:27
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:45
 msgid "Cover download"
-msgstr "Boek omslag download"
+msgstr "Download boekomslag"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:81
 msgid "Download covers from openlibrary.org"
@@ -3149,7 +3212,7 @@ msgstr "Download metagegevens van Douban.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:57
 msgid "Metadata download"
-msgstr "Metagegevens download"
+msgstr "Download metagegevens"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:144
 msgid "ratings"
@@ -3157,7 +3220,7 @@ msgstr "waarderingen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:144
 msgid "tags"
-msgstr "tags"
+msgstr "labels"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:145
 msgid "description/reviews"
@@ -3186,7 +3249,7 @@ msgid ""
 "access key below."
 msgstr ""
 "Om isbndb.com te gebruiken moet je je opgeven voor een %sgratis account%s, "
-"en je toegangs sleutel hieronder invoeren."
+"en je toegangssleutel hieronder invoeren."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:236
 msgid "Downloads social metadata from amazon.com"
@@ -3197,6 +3260,8 @@ msgid ""
 "Downloads series information from ww2.kdl.org. This website cannot handle "
 "large numbers of queries, so the plugin is disabled by default."
 msgstr ""
+"Download informatie over reeksen van ww2.kdl.org. Deze website kan geen "
+"grote hoeveelheden verkeer aan, en dus is de plug-in standaard uitgeschakeld."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:25
 msgid "Downloads metadata from Fictionwise"
@@ -3210,7 +3275,7 @@ msgstr "Vraag: %s"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:285
 msgid "Fictionwise timed out. Try again later."
-msgstr "Fictionwise time out. Probeer later opnieuw."
+msgstr "Fictionwise time-out. Probeer later opnieuw."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:286
@@ -3222,7 +3287,7 @@ msgid ""
 "SUMMARY:\n"
 " %s"
 msgstr ""
-"OPSOMMING:\n"
+"SAMENVATTING:\n"
 " %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:316
@@ -3243,27 +3308,26 @@ msgid ""
 msgstr ""
 "        %prog [options]\n"
 "\n"
-"        Haal metagegevens van Fictionwise. Je moet het opgeven als titel, "
-"auteur,\n"
-"        of sleutelwoorden. Geen ISBN mogelijk. Zal een maximum van 20 "
-"treffers ophalen,\n"
+"        Haal metagegevens van Fictionwise. Je moet ofwel titel, auteur,\n"
+"        uitgever of sleutelwoorden opgeven. Geen ISBN mogelijk. Zal een "
+"maximum van 20 treffers ophalen,\n"
 "        dus je moet je zoeksleutel zo specifiek mogelijk maken.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:362
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:363
 msgid "Book title"
-msgstr "Boektitel"
+msgstr "Titel boek"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:363
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:364
 msgid "Book author(s)"
-msgstr "Boek auteur(s)"
+msgstr "Auteur(s) boek"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:364
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:365
 msgid "Book publisher"
-msgstr ""
+msgstr "Uigever"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:365
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:367
@@ -3273,7 +3337,7 @@ msgstr "Sleutelwoorden"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:367
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:373
 msgid "Maximum number of results to fetch"
-msgstr "Maximum aantal op te halen resultaten"
+msgstr "Maximaal aantal op te halen resultaten"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fictionwise.py:369
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:375
@@ -3301,8 +3365,8 @@ msgstr ""
 "\n"
 "%prog [opties] sleutel\n"
 "\n"
-"Haal metagegevens voor boeken van isbndb.com. Je kunt of het ISBN nummer of "
-"de titel en auteur opgeven.\n"
+"Haal metagegevens voor boeken van isbndb.com. Je kunt ofwel het ISBN nummer "
+"ofwel titel en auteur opgeven.\n"
 "als je de titel en auteur opgeeft, dan is het mogelijk dat er meerdere "
 "resultaten zijn.\n"
 "\n"
@@ -3312,19 +3376,19 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:118
 msgid "The ISBN ID of the book you want metadata for."
-msgstr "Het ISBN Nr van het boek waarvoor je de metagegevens wilt."
+msgstr "Het ISBN-nummer van het boek waarvoor je de metagegevens wilt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:120
 msgid "The author whose book to search for."
-msgstr "De auteur van het boek om naar te zoeken."
+msgstr "De auteur van het gezochte boek."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:122
 msgid "The title of the book to search for."
-msgstr "De titel van het boek om naar te zoeken."
+msgstr "De titel van het gezochte boek."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:124
 msgid "The publisher of the book to search for."
-msgstr "De uitgever van het boek om naar te zoeken."
+msgstr "De uitgever van het gezochte boek."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
 msgid ""
@@ -3337,7 +3401,7 @@ msgstr ""
 "\n"
 "%prog [options] ISBN\n"
 "\n"
-"Haal een boek afbeelding / sociale metagegevens (labels, waarderingen, etc) "
+"Haal een omslagafbeelding / sociale metagegevens (labels, waarderingen, etc) "
 "voor het boek aangeduid met ISBN van LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:26
@@ -3352,12 +3416,12 @@ msgstr "Download omslagen van de franse Nicebooks"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:242
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:320
 msgid "Nicebooks timed out. Try again later."
-msgstr "Nicebooks time out. Probeer later opnieuw."
+msgstr "Nicebooks time-out. Probeer later opnieuw."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:119
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:243
 msgid "Nicebooks encountered an error."
-msgstr "Nicebook is fout gegaan."
+msgstr "Nicebook is in de fout gegaan."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:323
 msgid "ISBN: %s not found."
@@ -3378,10 +3442,18 @@ msgid ""
 "        It can also get covers if the option is activated.\n"
 "    "
 msgstr ""
+"        %prog [options]\n"
+"\n"
+"        Haal metagegevens van Nicebooks. Je moet ofwel titel, auteur,\n"
+"        ISBN, uitgever of sleutelwoorden opgeven. Zal een maximum van 20 "
+"treffers ophalen,\n"
+"        dus je moet je zoeksleutel zo specifiek mogelijk maken.\n"
+"        Je kan ook omslagen ophalen als die optie is aangevinkt.\n"
+"    "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:366
 msgid "Book ISBN"
-msgstr "Boek ISBN"
+msgstr "ISBN Boek"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:369
 msgid "Covers: 1-Check/ 2-Download"
@@ -3389,7 +3461,7 @@ msgstr "Omslagen: 1-Controleer/ 2-Download"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:371
 msgid "Covers files path"
-msgstr "Omslagen bestandspad"
+msgstr "Bestandspad voor omslagen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/nicebooks.py:396
 msgid "No cover found!"
@@ -3432,9 +3504,9 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
-msgstr "Metadata bron"
+msgstr "Bron metadata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/openlibrary.py:15
 msgid "Downloads metadata from The Open Library"
@@ -3442,18 +3514,19 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
-msgstr "Bewerk afbeelingen om binnen de Palm apparaat limieten te blijven."
+msgstr ""
+"Bewerk afbeeldingen om binnen limieten  van het Palmapparaat te blijven."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
-msgstr "Indien aanwezig, gebruik auteur sortering veld als auteur."
+msgstr "Indien aanwezig, gebruik sorteerauteur als auteur."
 
 #: /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 ""
-"Voeg geen inhoudsopgave toe aan het einde van het boek. Handig als jet boek "
+"Voeg geen inhoudsopgave toe aan het einde van het boek. Handig als het boek "
 "al een eigen index bevat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:33
@@ -3463,12 +3536,12 @@ msgstr "Titel voor iedere gegenereerde in-line inhoudsopgave."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
-msgstr "Deactiveer compressie van de bestands inhoud"
+msgstr "Deactiveer compressie van de bestandsinhoud"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:40
 msgid "Tag marking book to be filed with Personal Docs"
 msgstr ""
-"Tag dat aangeeft dat het book bij de Persoonlijke documenten moet worden "
+"Label dat aangeeft dat het boek bij de Persoonlijke documenten moet worden "
 "opgeslagen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:44
@@ -3477,6 +3550,8 @@ msgid ""
 "will try to convert margins specified in the input document, otherwise it "
 "will ignore them."
 msgstr ""
+"Negeer marges in de invoer. Als dit afstaat zal de MOBI-outputplug-in  "
+"marges in het invoerdocument proberen om te zetten, anders negeert hij ze."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:113
 msgid "All articles"
@@ -3551,11 +3626,11 @@ msgstr "Voorwoord"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1507
 msgid "Main Text"
-msgstr "Hoofd Tekst"
+msgstr "Hoofdtekst"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
-msgstr "%s formaat boeken worden niet ondersteund"
+msgstr "boeken in %s-formaat worden niet ondersteund"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/cover.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:176
@@ -3566,10 +3641,10 @@ msgstr "Boek %s van %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
-msgstr "HTML inhoudsopgave generatie opties"
+msgstr "Opties generatie HTML-inhoudsopgave"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3579,21 +3654,21 @@ msgstr "Waardering"
 msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
-"Kon geen redelijk punt vinden om te spiltsen: %s Sub-tree grootte: %d KB"
+"Kon geen redelijk punt vinden om te splitsen: %s Sub-tree grootte: %d KB"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
-msgstr "OPF/NCX/etc. generatie opties."
+msgstr "Opties generatie OPF/NCX/etc."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
-msgstr "OPF versie om te genereren. Standaard is %default."
+msgstr "OPF-versie om te genereren. Standaard is %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 ""
-"Generee een Adobe \"pagina-map\" bestand als paginering informatie "
+"Genereer een Adobe \"pagina-map\"-bestand als informatie over paginering "
 "beschikbaar is."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
@@ -3606,15 +3681,15 @@ msgstr "Zijpaneel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
 msgid "Format to use inside the pdb container. Choices are:"
-msgstr "formaat te gebruiken in de pdb container. Keuzes zijn:"
+msgstr "formaat te gebruiken in de pdb-container. Keuzes zijn:"
 
 #: /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 ""
-"Specificeer de karakter codering van het uitvoer document. Standaard is "
-"cp1252. Deze optie word niet nageleeft door alle formaten."
+"Specificeer de karaktercodering van het uitvoerdocument. Standaard is "
+"cp1252. Deze optie word niet nageleefd door alle formaten."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:37
@@ -3639,7 +3714,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
-msgstr "Gebruik het nieuwe PDF conversie systeem."
+msgstr "Gebruik het nieuwe PDF-conversiesysteem."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
@@ -3654,7 +3729,7 @@ msgid ""
 msgstr ""
 "commando ...\n"
 "\n"
-"commando can een van de volgenden zijn:\n"
+"commando can een van de volgende zijn:\n"
 "[%%commands]\n"
 "\n"
 "Gebruik %prog commando --help om meer informatie over een specifiek commando "
@@ -3670,7 +3745,7 @@ msgid ""
 msgstr ""
 "[opties] bestand.pdf\n"
 "\n"
-"Een PDF bestand inkorten.\n"
+"Een PDF-bestand inkorten.\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
@@ -3682,8 +3757,8 @@ msgstr ""
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
-"Pad naar uitvoer bestand. Standaard worden bestanden aangemaakt in de "
-"huidige folder."
+"Pad naar uitvoerbestand. Standaard worden bestanden aangemaakt in de huidige "
+"map."
 
 #: /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)"
@@ -3691,28 +3766,28 @@ msgstr "Aantal pixels te knippen van de meest linkse x (standaard is %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 "Aantal pixels te knipper van de meest linkse y (standaard is %s)"
+msgstr "Aantal pixels te knippen van de meest linkse y (standaard is %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 "Aantal pixels te knipper van de meest rechtse x (standaard is %s)"
+msgstr "Aantal pixels te knippen van de meest rechtse x (standaard is %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 "Aantal pixels te knipper van de meest rechtse y (standaard is %s)"
+msgstr "Aantal pixels te knippen van de meest rechtse y (standaard is %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 ""
-"Een bestand gegenereert door ghostscript waarbij iedere pagina individueel "
+"Een bestand gegenereerd door ghostscript waarbij iedere pagina individueel "
 "word geknipt  `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 "Knip opties"
+msgstr "Knipopties"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
@@ -3722,7 +3797,7 @@ msgstr "Knip opties"
 #: /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 "Opties betreffende de PDF transformatie"
+msgstr "Opties betreffende de PDF-transformatie"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
 msgid ""
@@ -3736,7 +3811,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
-msgstr "Ontsleutel Opties:"
+msgstr "Decodeeropties:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
 msgid ""
@@ -3750,7 +3825,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
-msgstr "Versleutel Opties:"
+msgstr "Versleutelopties:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:21
 msgid ""
@@ -3760,7 +3835,7 @@ msgid ""
 msgstr ""
 "bestand.pdf ...\n"
 "\n"
-"Informatie over een PDF bestand.\n"
+"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:75
@@ -3769,6 +3844,7 @@ msgid "Author"
 msgstr "Auteur"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -3782,11 +3858,11 @@ msgstr "Pagina's"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
-msgstr "Bestand grootte"
+msgstr "Bestandsgrootte"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
-msgstr "PDF Versie"
+msgstr "PDF-Versie"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
@@ -3798,13 +3874,13 @@ msgid ""
 msgstr ""
 "[opties] bestand1.pdf bestand2.pdf ...\n"
 "\n"
-"Metagegevens van het eerste PDF bestand zullen worden gebruikt.\n"
+"Metagegevens van het eerste PDF-bestand zullen worden gebruikt.\n"
 "\n"
-"Samenvoegen individuele PDFs.\n"
+"invoegen individuele PDFs.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
-msgstr "Samenvoeg Opties:"
+msgstr "Opties invoegen:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25
 msgid ""
@@ -3818,7 +3894,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
-msgstr "Omkeer Opties:"
+msgstr "Omkeeropties:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24
 msgid ""
@@ -3832,7 +3908,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
-msgstr "Rotatie Opties:"
+msgstr "Rotatieopties:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
@@ -3862,55 +3938,56 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
-msgstr "Splits Opties:"
+msgstr "Splitsopties:"
 
 #: /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 ""
-"De meeteenheid. Standaard is inch (2.54 cm). Keuzes zijn %s Note: Dit neemt "
-"geen voorrang over de kantlijn eenheden!"
+"De meeteenheid. Standaard is inch (2.54 cm). Keuzes zijn %s Opmerking: dit "
+"verandert de eenheden voor de kantlijn niet!"
 
 #: /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 ""
-"Papier grootte. Deze zal vervallen indien een uitvoer profiel wordt "
-"gebruikt. Standaard is Letter. Keuzes zijn %s"
+"Papiergrootte. Deze zal vervallen indien een uitvoerprofiel wordt gebruikt. "
+"Standaard is Letter. Keuzes zijn %s"
 
 #: /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 ""
-"Aangepaste dimensies van het document. Gebruik het formaat BreedtexHoogte, "
+"Aangepaste afmetingen van het document. Gebruik het formaat BreedtexHoogte, "
 "bijvoorbeels `123x321` om de breedte en hoogte te specificeren. Dit neemt "
-"voorrang over een gespecificeerd papier formaat."
+"voorrang over een gespecificeerd papierformaat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
 msgid "The orientation of the page. Default is portrait. Choices are %s"
 msgstr ""
-"De orientatie van de pagina. Standaard is Portrait (Staand). Keuzes zijn %s"
+"De oriëntatie van de pagina. Standaard is Portrait (Staand). Keuzes zijn %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 "
 "full first page of the generated pdf."
 msgstr ""
+"Behoud lengte/breedteverhouding van de omslag in plaats van hem uit te "
+"rekken tot de volledige grootte van de voortgebrachte pdf."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr ""
-"Pdftohtml kon niet worden gevonden, controleer of het in je zoekpad zit."
+"pdftohtml kon niet worden gevonden, controleer of het in je zoekpad zit."
 
 #: /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 ""
-"Specificeer de karakter codering van het uitvoer document. Standaard is "
-"cp1252."
+"Specificeer de karaktercodering van het uitvoerdocument. Standaard is cp1252."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:40
 msgid ""
@@ -3918,14 +3995,14 @@ msgid ""
 "depth reduced by default to accommodate applications that can not convert "
 "images on their own such as Dropbook."
 msgstr ""
-"Verminder niet de grootte of bitdiepte van plaatjes. Grootte en bitdiepte "
+"Verminder de grootte of bitdiepte van plaatjes niet. Grootte en bitdiepte "
 "worden standaard verminderd voor programma's die geen plaatjes kunnen "
 "aanpassen uit zichzelf zoals Dropbook."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:97
 msgid "Table of Contents:"
-msgstr "Inhoudsopage:"
+msgstr "Inhoudsopgave:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:272
 msgid ""
@@ -3933,7 +4010,7 @@ msgid ""
 "first and then try it.\n"
 "%s"
 msgstr ""
-"Dit RTF-bestand heeft een functie die calibre niet ondersteund.Converteer "
+"Dit RTF-bestand heeft een functie die calibre niet ondersteunt. Converteer "
 "het eerst naar HTML en probeer nogmaals.\n"
 "%s"
 
@@ -3947,7 +4024,7 @@ msgstr ""
 msgid ""
 "Specify the character encoding of the output document. The default is utf-8."
 msgstr ""
-"Specificer de karakter codering van het uitvoer document. Standaard is utf-8."
+"Specificeer de karakterkodering van het uitvoerdocument. Standaard is utf-8."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:29
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:44
@@ -3958,16 +4035,16 @@ msgid ""
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
 "Het maximale aantal karakters per regel. Dit splitst op de eerste spatie "
-"voor de betreffende waarde. Als egeen spatie word gevonden, dan zal de regel "
-"worden afgebroken bij de spatie hierna, en zal groter zijn dan de opgegeven "
-"waarde. Er is een minimum van 25 tekens. Gebruik 0 om de regel splitsing uit "
-"te schakelen."
+"voor de betreffende waarde. Als er geen spatie word gevonden, dan zal de "
+"regel worden afgebroken bij de spatie hierna, en zal groter zijn dan de "
+"opgegeven waarde. Er is een minimum van 25 tekens. Gebruik 0 om de "
+"regelsplitsing uit te schakelen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:36
 msgid ""
 "Specify whether or not to insert an empty line between two paragraphs."
 msgstr ""
-"Geef aan of er wel of niet een lege regel tussen twee paragrafen moet komen."
+"Geef aan of er wel of niet een lege regel tussen twee alinea's moet komen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:40
 msgid ""
@@ -3975,7 +4052,7 @@ msgid ""
 "line of each paragraph."
 msgstr ""
 "Geef aan of er wel of niet twee spaties als indentatie voor elke eerste "
-"regel van een paragraaf moet komen."
+"regel van een alinea moet komen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:44
 msgid ""
@@ -3983,20 +4060,20 @@ msgid ""
 "for image-only output (eg. comics)."
 msgstr ""
 "Geef aan of de hoofdstuktitel voor elk hoofdstuk verborgen moet worden. "
-"Handig voor alleen afbeeldingen (zoals strips)."
+"Handig voor uitvoer met alleen afbeeldingen (zoals strips)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:48
 msgid "Resize all the images for full screen view. "
-msgstr ""
+msgstr "Herschaal alle afbeeldingen naar een volledig scherm. "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:125
 msgid "Start Page"
-msgstr "Start Pagina"
+msgstr "Startpagina"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:135
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:137
 msgid "Cover Pages"
-msgstr "Omslag Pagina's"
+msgstr "Omslagpagina's"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:150
 #: /home/kovid/work/calibre/src/calibre/ebooks/snb/output.py:153
@@ -4018,6 +4095,19 @@ msgid ""
 "* off: Don't modify the paragraph structure. This is useful when combined "
 "with Markdown or Textile formatting to ensure no formatting is lost."
 msgstr ""
+"Alineastructuur.Keuzes zijn [''auto', 'blok', 'enkel', 'print', "
+"'ongeformatteerd', 'uit']\n"
+"* auto: Probeer autodetectie van alineatype.\n"
+"* blok: Een blanco lijn duidt einde alinea aan.\n"
+"* enkel: Elke lijn bevat een alinea.\n"
+"* print: Elke lijn met minstens twee spaties of een tab aan het begin begint "
+"een alinea.\n"
+"* ongeformatteerd: De meeste lijnen hebben harde lijneindes, weinig of geen "
+"blancolijnen  of indentaties. Probeert de structuur vast te stellen en de "
+"onderscheidende elementen te herformatteren.\n"
+"* uit: Wijzig de alineastructuur niet. Nuttig in combinatie met Markdown of "
+"Textileformattering zodat geen formattering verloren gaat\n"
+"."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:43
 msgid ""
@@ -4031,24 +4121,33 @@ msgid ""
 "* markdown: Processing using markdown formatting. To learn more about "
 "markdown see"
 msgstr ""
+"Formattering gebruikt binnen het the document.\n"
+" * auto: Bepaal zelf welke formaatprocessor gebruikt wordt.\n"
+"* vlak: Verwerk de formattering niet. Alles is een alinea en geen styling "
+"wordt toegepast.* heuristiek: Verwerk met gebruik van heuristieken om zaken "
+"zoals hoofdstukhoofdingen en schuine tekst te vinden.\n"
+"* textile: Verwerk met Textile-formatting.\n"
+"* markdown: Om meer over markdownformattering te leren zie"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:53
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
-"Normaal worden alle spaties door een enkele spatie vervangen. Met deze optie "
-"zullen alle spaties zichtbaar gemaakt worden."
+"Normaal worden alle meervoudige 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:56
 msgid ""
 "Normally extra space at the beginning of lines is retained. With this option "
 "they will be removed."
 msgstr ""
+"Normaal worden spaties aan het begin van een lijn behouden. Met deze optie "
+"worden ze verwijderd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:59
 msgid "Do not insert a Table of Contents into the output text."
-msgstr "Voeg geen inhoudsopgave toe aan de uitvoer tekst."
+msgstr "Voeg geen inhoudsopgave toe aan de uitvoertekst."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:31
 msgid ""
@@ -4056,19 +4155,19 @@ 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 ""
-"Nieuwe regel type te gebruiken. Opties zijn %s. Standaard is 'system'. "
+"Te gebruiken nieuweregelteken. Opties zijn %s. Standaard is 'system'. "
 "Gebruik 'old_mac' voor compatibiliteit met Mac OS 9 en ouder. Voor Mac OS X "
-"gebruik 'unix'. 'system' zal standaard het nieuwe regel type gebruiken dat "
-"standaard is op dit besturings systeem."
+"gebruik 'unix'. 'system' zal standaard het nieuweregelteken gebruiken dat "
+"standaard is op dit besturingssysteem."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:51
 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 ""
-"Forceer splitsen op de maximale regel lengte wanneer er geen spatie is. Dit "
-"staat ook toe een maximale regel lengthe te gebruiken die onder de minimum "
-"waarde ligt."
+"Forceer splitsen op de maximale regellengte wanneer er geen spatie is. Dit "
+"staat ook toe een maximale regel lengte te gebruiken die onder de "
+"minimumwaarde ligt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:56
 msgid ""
@@ -4077,6 +4176,10 @@ msgid ""
 "* markdown: Produce Markdown formatted text.\n"
 "* textile: Produce Textile formatted text."
 msgstr ""
+"Formattering gebruikt binnen document.\n"
+"* vlak: Tekst zonder formattering.\n"
+"* markdown: markdown formattering.\n"
+"* textile: textile formattering."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:62
 msgid ""
@@ -4084,6 +4187,9 @@ msgid ""
 "with a txt-output-formatting option that is not none because links are "
 "always removed with plain text output."
 msgstr ""
+"Verwijder geen links binnen het document. Dit is alleen zinvol samen met een "
+"txt-uitvoeroptie verschillend van \"geen\" want links worden altijd uit "
+"vlakke tekstuitvoer verwijderd."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:67
 msgid ""
@@ -4091,142 +4197,154 @@ msgid ""
 "paired with a txt-output-formatting option that is not none because links "
 "are always removed with plain text output."
 msgstr ""
+"Verwijder geen links naar afbeeldingen binnen het document. Dit is alleen "
+"zinvol samen met een txt-uitvoeroptie verschillend van \"geen\" want links "
+"worden altijd uit vlakke tekstuitvoer verwijderd."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
-"Stuur bestand standaard naar de externe opslag ruimte in plaats van het "
-"hoofd geheugen"
+"Stuur bestand standaard naar de externe opslagruimte in plaats van het "
+"hoofdgeheugen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
-msgstr "Bevestig alvorens verwijdering"
+msgstr "Bevestig alvorens te verwijderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
-msgstr "Hoofdscherm geometrie"
+msgstr "Geometrie hoofdscherm"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Laat weten wanneer er een nieuwe versie is"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
-msgstr "Gebruik Romeinse nummers voor serie nummers"
+msgstr "Gebruik Romeinse nummers voor reeksnummers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Sorteer de lijst met labels op naam, populariteit of waardering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
-msgid "Number of covers to show in the cover browsing mode"
-msgstr "Aantal weer te geven boekomslagen in omslag blader modus"
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
+msgid "Number of covers to show in the cover browsing mode"
+msgstr "Aantal weer te geven boekomslagen in omslagbladermodus"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Standaarden voor conversie naar LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
-msgid "Options for the LRF ebook viewer"
-msgstr "Opties voor de LRF eboek viewer"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+msgid "Options for the LRF ebook viewer"
+msgstr "Opties voor de LRF e-boekviewer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formaten die worden bekeken met de interne viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Weer te geven kolommen in de boekenlijst"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Start content server automatisch bij applicatie start"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Bewaar oudste nieuws in database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Systeemvakpictogram tonen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Upload gedownload nieuws naar apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Verwijder boeken van bibliotheek na uploaden naar apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
-"Laat de omslag afbeelding in een apart window zien in plaats van calibre's "
+"Laat de omslagafbeelding in een apart venster zien in plaats van calibres "
 "hoofdscherm"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
-msgstr "Schakel notificaties in systeem tray uit"
+msgstr "Schakel notificaties vanuit systeemtray uit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
-"Standaard actie te ondernemen wanneer zend naar apparaat knop is aangeklikt"
+"Standaard actie te ondernemen wanneer stuur-naar-apparaatknop is aangeklikt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
+"Zoeken start tijdens het intypen. Als dit uit staat dan begint zoeken pas "
+"als de Enter- of Returntoets ingedrukt wordt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
+"Toon alle boeken, met zoekresultaten oplichtend, in plaats van alleen de "
+"zoekresultaten bij het zoeken. Met de N- of de F3-toets kan je naar het "
+"volgende zoekresultaat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
-msgstr "Maximum aantal wachtende werk processen"
+msgstr "Maximaal aantal wachtende werkprocessen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Download sociale metagegevens (labels, waarderingen, etc)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Overschrijf auteur en titel met nieuwe metagegevens"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Download de omslag automatisch als deze er is"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
-"Limiteer maximum aantal tegelijktijdige processen tot het aantal CPU's"
+"Beperk maximaal aantal tegelijktijdige processen tot het aantal CPU's"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
-msgstr "De indeling van de gebruikers interface"
+msgstr "De indeling van de gebruikersinterface"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
-msgstr "Laat de gemiddelde waardering per item in de categorieenbrowser zien"
+msgstr "Laat de gemiddelde waardering per item in de labelbrowser zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
-msgstr "Blokkeer GI animaties"
+msgstr "Blokkeer GUI-animaties"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
-msgstr "markeer de browsercategorieen die verborgen moeten blijven"
+msgstr "categorieën die verborgen moeten blijven in de labelbrowser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Kies bestanden"
 
@@ -4238,39 +4356,39 @@ msgstr "Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:29
 msgid "EPUB Books"
-msgstr "EPUB Boeken"
+msgstr "EPUB-Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:30
 msgid "LRF Books"
-msgstr "LRF Boeken"
+msgstr "LRF-Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:31
 msgid "HTML Books"
-msgstr "HTML Boeken"
+msgstr "HTML-Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:32
 msgid "LIT Books"
-msgstr "LIT Boeken"
+msgstr "LIT-Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:33
 msgid "MOBI Books"
-msgstr "MOBI Boeken"
+msgstr "MOBI-Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:34
 msgid "Topaz books"
-msgstr "Topaz boeken"
+msgstr "Topaz-boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:35
 msgid "Text books"
-msgstr "Text boeken"
+msgstr "TXT-boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:36
 msgid "PDF Books"
-msgstr "PDF Boeken"
+msgstr "PDF-Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:37
 msgid "SNB Books"
-msgstr "SNB Boeken"
+msgstr "SNB-Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:38
 msgid "Comics"
@@ -4287,7 +4405,7 @@ msgstr "Voeg boeken toe"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:47
 msgid "Add books to the calibre library/device from files on your computer"
 msgstr ""
-"Voeg boeken uit computerbestanden toe aan de Calibre bibliotheek/apparaat"
+"Voeg boeken uit computerbestanden toe aan de calibrebibliotheek/apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:48
 msgid "A"
@@ -4295,23 +4413,23 @@ msgstr "A"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:54
 msgid "Add books from a single directory"
-msgstr "Voeg boeken toe uit een enkele folder"
+msgstr "Voeg boeken toe uit een enkele map"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:56
 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 ""
-"Voeg boeken toe uit mappen, inclusief submappen (Een boek per map, neemt aan "
-"dat ieder e-boek bestand hetzelfde boek in een ander formaat bevat)"
+"Voeg boeken toe uit mappen, inclusief deelmappen (Een boek per map, neemt "
+"aan dat ieder e-boekbestand hetzelfde boek in een ander formaat bevat)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:60
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
-"Voeg boeken toe uit mappen, inclusief submappen (Meerdere boeken per map, "
-"neemt aan dat ieder e-boek bestand een ander boek bevat)"
+"Voeg boeken toe uit mappen, inclusief deelmappen (Meerdere boeken per map, "
+"neemt aan dat ieder e-boekbestand een ander boek bevat)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:64
 msgid "Add Empty book. (Book entry with no formats)"
@@ -4327,7 +4445,7 @@ msgstr "Toevoegen met behulp van ISBN"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:68
 msgid "Add files to selected book records"
-msgstr ""
+msgstr "Voeg bestanden toe aan geselecteerde boekrecords"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:69
 msgid "Shift+A"
@@ -4335,25 +4453,27 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:89
 msgid "Are you sure"
-msgstr ""
+msgstr "Ben je zeker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:90
 msgid ""
 "Are you sure you want to add the same files to all %d books? If the "
 "formatalready exists for a book, it will be replaced."
 msgstr ""
+"Wil je echt dezelfde bestanden aan alle %d boeken toevoegen? Als het formaat "
+"al bestaat voor een boek wordt het vervangen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:96
 msgid "Select book files"
-msgstr ""
+msgstr "Kies boekbestanden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:167
 msgid "Adding"
-msgstr ""
+msgstr "Toevoegen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:168
 msgid "Creating book records from ISBNs"
-msgstr ""
+msgstr "Creëren boekrecords vanuit ISBN"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:312
@@ -4366,11 +4486,11 @@ msgstr "Ondersteunde boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:286
 msgid "Select books"
-msgstr ""
+msgstr "Kies boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:323
 msgid "Merged some books"
-msgstr "Enkele boeken zijn samengevoegd"
+msgstr "Enkele boeken zijn ingevoegd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:324
 msgid ""
@@ -4378,6 +4498,9 @@ msgid ""
 "processed and merged into your Calibre database according to your automerge "
 "settings:"
 msgstr ""
+"Volgende boeken werden in tweevoud gevonden. Ingevoerde boekformaten werden "
+"verwerkt en ingevoegd in je Calibredatabank volgens je instellingen voor "
+"Automatisch Invoegen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:344
 msgid "Failed to read metadata"
@@ -4406,11 +4529,11 @@ msgid ""
 "The following books are virtual and cannot be added to the calibre library:"
 msgstr ""
 "De volgende boeken zijn virtueel en kunnen niet toegevoegd worden aan de "
-"Calibre bibliotheek:"
+"calibrebibliotheek:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:390
 msgid "No book files found"
-msgstr "Geen boek bestanden gevonden"
+msgstr "Geen boekbestanden gevonden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add_to_library.py:13
 msgid "Add books to library"
@@ -4418,8 +4541,7 @@ msgstr "Voeg boeken toe aan de bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add_to_library.py:14
 msgid "Add books to your calibre library from the connected device"
-msgstr ""
-"Voeg boeken op je aangesloten apparaat toe aan de Calibre bibliotheek"
+msgstr "Voeg boeken op je aangesloten apparaat toe aan de calibrebibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:20
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:561
@@ -4443,8 +4565,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Geen boeken geselecteerd"
@@ -4456,7 +4578,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:90
 msgid "Merging user annotations into database"
-msgstr "Voeg annotaties van gebruikers samen in een database"
+msgstr "Voeg annotaties van gebruikers in een database in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:118
 msgid "%s<br />Last Page Read: %d (%d%%)"
@@ -4481,15 +4603,15 @@ msgstr "<b>Locatie %d &bull; %s</b><br />"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:20
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:34
 msgid "Create a catalog of the books in your calibre library"
-msgstr ""
+msgstr "Creëer een catalogus van de boeken in je bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:31
 msgid "No books selected for catalog generation"
-msgstr ""
+msgstr "Geen boeken gesecteerd voor cataloguscreatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:54
 msgid "Generating %s catalog..."
-msgstr "Genereren %s catalogus"
+msgstr "Genereren catalogus %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:78
 msgid "Catalog generated."
@@ -4497,7 +4619,7 @@ msgstr "Catalogus aangemaakt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:81
 msgid "Export Catalog Directory"
-msgstr "Exporteer Catalogus Folder"
+msgstr "Exporteer Catalogusmap"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:82
 msgid "Select destination for %s.%s"
@@ -4512,7 +4634,7 @@ msgstr "%d boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:82
 msgid "Choose calibre library to work with"
-msgstr "Kies een calibre bibliotheek om mee te werken"
+msgstr "Kies een calibrebibliotheek om mee te werken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:91
 msgid "Switch/create library..."
@@ -4539,11 +4661,11 @@ msgstr "Kies een willekeurig boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:128
 msgid "Library Maintenance"
-msgstr "Bibliotheek Onderhoud"
+msgstr "Onderhoud Bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:129
 msgid "Library metadata backup status"
-msgstr "Bibliotheek metagegevens backup status"
+msgstr "backupstatus metagegevens Bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:133
 msgid "Start backing up metadata of all books"
@@ -4568,7 +4690,7 @@ msgstr "Kies een nieuwe naam voor bibliotheek <b>%s</b>. "
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:218
 msgid "Note that the actual library folder will be renamed."
 msgstr ""
-"Merk op dat de feitelijke map van de bibliotheek zal worden hernoemd."
+"Let erop dat de feitelijke map van de bibliotheek zal worden hernoemd."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:225
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:199
@@ -4577,7 +4699,7 @@ msgstr "Bestaat al"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:226
 msgid "The folder %s already exists. Delete it first."
-msgstr "De map %s bestaat al. Verwijder deze eerst."
+msgstr "Map %s bestaat al. Verwijder deze eerst."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:232
 msgid "Rename failed"
@@ -4616,11 +4738,11 @@ msgstr "geen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:266
 msgid "Backup status"
-msgstr "Backup status"
+msgstr "Status backup"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:267
 msgid "Book metadata files remaining to be written: %s"
-msgstr "Metagegeven-bestanden die nog geschreven moeten worden: %s"
+msgstr "Metagegevensbestanden die nog geschreven moeten worden: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:273
 msgid "Backup metadata"
@@ -4631,6 +4753,8 @@ msgid ""
 "Metadata will be backed up while calibre is running, at the rate of "
 "approximately 1 book every three seconds."
 msgstr ""
+"Metadata worden geback-upt terwijl calibre loopt aan een tempo van zowat 1 "
+"boek per drie seconden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:306
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:106
@@ -4638,20 +4762,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:286
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:340
 msgid "Success"
-msgstr ""
+msgstr "Succes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:307
 msgid ""
 "Found no errors in your calibre library database. Do you want calibre to "
 "check if the files in your  library match the information in the database?"
 msgstr ""
-"Geen fouten gevonden in de calibre bibliotheek-database. Moet calibre "
+"Geen fouten gevonden in de databank van de calibrebibliotheek. Moet calibre "
 "controleren of de bestanden in de bibliotheek overeenkomen met informatie in "
-"de database?"
+"de databank?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4663,6 +4787,7 @@ msgstr "Mislukt"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:313
 msgid "Database integrity check failed, click Show details for details."
 msgstr ""
+"Controle databankintegriteit faalt. Klik op \"Toon details\" voor details."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:318
 msgid "No problems found"
@@ -4682,7 +4807,7 @@ msgid ""
 "No existing calibre library was found at %s. It will be removed from the "
 "list of known libraries."
 msgstr ""
-"Geen bestaande Calibre bibliotheek gevonden op %s. Wordt verwijderd van de "
+"Geen bestaande calibrebibliotheek gevonden op %s. Wordt verwijderd van de "
 "lijst van bestaande bibliotheken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:395
@@ -4720,10 +4845,10 @@ msgstr "Converteer Individueel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:30
 msgid "Bulk convert"
-msgstr "Converteer Groep"
+msgstr "Converteer in groep"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Kan niet converteren"
 
@@ -4731,7 +4856,7 @@ msgstr "Kan niet converteren"
 msgid "Starting conversion of %d book(s)"
 msgstr "Start conversie van %d boek(en)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "Leeg uitvoerbestand, waarschijnlijk is het conversieproces fout gegaan"
@@ -4746,11 +4871,11 @@ msgstr "Kopieer geselecteerde boeken naar de aangegeven bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:117
 msgid "(delete after copy)"
-msgstr "(Verwijder na kopieren)"
+msgstr "(Verwijder na kopiëren)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:126
 msgid "Cannot copy"
-msgstr "Kan niet kopieren"
+msgstr "Kan niet kopiëren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:131
 msgid "No library"
@@ -4767,7 +4892,7 @@ msgstr "Bezig met kopiëren van"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
 msgid "Could not copy books: "
-msgstr "Kan boeken niet kopieren: "
+msgstr "Kan boeken niet kopiëren: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:153
 msgid "Copied %d books to %s"
@@ -4783,7 +4908,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:32
 msgid "Deleting..."
-msgstr "Verwijderen…"
+msgstr "Verwijderen..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:54
 msgid "Deleted"
@@ -4818,7 +4943,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:84
 msgid "Remove all formats from selected books, except..."
-msgstr "Verwijder alle formaten van de geselecterde boeken, behalve..."
+msgstr "Verwijder alle formaten van de geselecteerde boeken, behalve..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:87
 msgid "Remove covers from selected books"
@@ -4850,7 +4975,7 @@ msgstr "Geen apparaat gevonden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:175
 msgid "Main memory"
-msgstr "|Hoofdgeheugen"
+msgstr "Hoofdgeheugen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:486
@@ -4866,7 +4991,7 @@ msgstr "Geheugenkaart B"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:182
 msgid "No books to delete"
-msgstr "Er  zijn geen boeken om te verwijderen"
+msgstr "Er zijn geen boeken om te verwijderen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:183
 msgid "None of the selected books are on the device"
@@ -4882,14 +5007,16 @@ msgid ""
 "Some of the selected books are on the attached device. <b>Where</b> do you "
 "want the selected files deleted from?"
 msgstr ""
+"Sommige geselecteerde boeken staan op de lezer. <b>Waarvan</b> wil je de "
+"geselecteerde bestanden verwijderen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:258
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your calibre library. Are you sure?"
 msgstr ""
-"De geselecteerde boeken zullen <b>definitief</b> worden <b>verwijderd</b> en "
-"de bestanden zullen worden verwijderd uit je calibre bibliotheek. Wil je dit "
+"De geselecteerde boeken zullen <b>definitief verwijderd</b> worden en de "
+"bestanden zullen worden verwijderd uit je calibrebibliotheek. Wil je dit "
 "echt?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:283
@@ -4897,12 +5024,12 @@ msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
-"De geselecteerde boeken zullen <b>definitief verwijderd</b> worden van uw "
-"apparaat. Weet u het zeker?"
+"De geselecteerde boeken zullen <b>definitief verwijderd</b> worden van je "
+"apparaat. Weet je het zeker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:31
 msgid "Connect to folder"
-msgstr "Verbind met folder"
+msgstr "Verbind met map"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:36
 msgid "Connect to iTunes"
@@ -4910,7 +5037,7 @@ msgstr "Verbind met iTunes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:42
 msgid "Connect to Bambook"
-msgstr ""
+msgstr "Verbind met Bambook"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:64
@@ -4922,43 +5049,43 @@ msgid "Stop Content Server"
 msgstr "Stop Content Server"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
-msgstr "Email naar"
+msgstr "e-mail naar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:81
 msgid "Email to and delete from library"
-msgstr "Email naar en verwijder uit bibliotheek"
+msgstr "e-mail naar en verwijder uit bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(verwijder uit bibliotheek)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
-msgstr "Stel het delen van boeken via email in"
+msgstr "Stel het delen van boeken via e-mail in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
-msgstr "Zend naar lezer"
+msgstr "Stuur naar lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
-msgstr "Connectie/deel"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
-msgid "Stopping"
-msgstr ""
+msgstr "Verbind/deel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
+msgid "Stopping"
+msgstr "Stoppen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
-msgstr ""
+msgstr "Server wordt gestopt, dit kan tot een minuut duren. Wachten aub."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_collections.py:13
 msgid "Manage collections"
@@ -4966,7 +5093,7 @@ msgstr "Bewerk collecties"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_collections.py:14
 msgid "Manage the collections on this device"
-msgstr "Beheer de verzamelingen op dit apparaat"
+msgstr "Beheer de collecties op dit apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:24
 msgid "E"
@@ -4978,7 +5105,7 @@ msgstr "Bewerk metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:28
 msgid "Merge book records"
-msgstr "Voeg gegevens van boeken samen"
+msgstr "Voeg gegevens van boeken in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:29
 msgid "M"
@@ -4994,7 +5121,7 @@ msgstr "Bewerk metagegevens op groepsniveau"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:37
 msgid "Download metadata and covers"
-msgstr "Download metagegevens en omslag afbeeldingen"
+msgstr "Download metagegevens en omslagafbeeldingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:40
 msgid "Download only metadata"
@@ -5002,7 +5129,7 @@ msgstr "Download alleen metagegevens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:42
 msgid "Download only covers"
-msgstr "Download alleen omslag afbeeldingen"
+msgstr "Download alleen omslagafbeeldingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:45
 msgid "Download only social metadata"
@@ -5010,15 +5137,15 @@ msgstr "Download alleen sociale metagegevens (labels, waarderingen, etc)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:51
 msgid "Merge into first selected book - delete others"
-msgstr "Samenvoegen met het eerste geselecteerde boek - verwijder de anderen"
+msgstr "invoegen in het eerste geselecteerde boek - verwijder de andere"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:54
 msgid "Merge into first selected book - keep others"
-msgstr "Samenvoegen met het eerste geselecteerde boek - behoudt de anderen"
+msgstr "invoegen in het eerste geselecteerde boek - behoud de andere"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:58
 msgid "Merge only formats into first selected book - delete others"
-msgstr "Alleen formaten met het eerste boek samenvoegen - verwijder andere"
+msgstr "Alleen formaten in het eerste boek invoegen - verwijder andere"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:79
 msgid "Cannot download metadata"
@@ -5030,7 +5157,7 @@ msgstr "sociale metagegevens (labels, waarderingen, etc)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:101
 msgid "covers"
-msgstr "Omslag afbeeldingen"
+msgstr "Omslagafbeeldingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:227
@@ -5042,21 +5169,21 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Bezig met downloaden boek {0} van de {1} boek(en)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Metagegevens kunnen niet bewerkt worden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
-msgstr "Kan boeken niet samenvoegen"
+msgstr "Kan boeken niet invoegen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5064,7 +5191,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5072,11 +5199,11 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 "Boekformaten en metagegevens van de selectie zullen toegevoegd worden aan "
-"het <b>eerst geselecteerde boek</b> (%s). ISBN zal <i>niet</i> samengevoegd "
+"het <b>eerst geselecteerde boek</b> (%s). ISBN zal <i>niet</i> ingevoegd "
 "worden.<br><br>De geselecteerde boeken zullen niet verwijderd of aangepast "
 "worden.<br><br>Bevestig als je wilt doorgaan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5087,8 +5214,15 @@ msgid ""
 "and subsequently selected books will be permanently <b>deleted</b> from your "
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
+"Boekformaten van de selectie zullen toegevoegd worden in het <b>eerst "
+"geselecteerde boek</b> (%s). Metadata in dit boek worden <i>niet</i> "
+"veranderd. Titel, ISBN noch andere metadata zullen ingevoegd "
+"worden.<br><br>Na samenvoegen worden het tweede boek en de volgende "
+"<b>verwijderd</b>. Alle boekformaten in het eerst geselcteerde boek worden "
+"behouden en elk duplicaatformaat in de volgende boeken worden<b>permanent "
+"verwijderd</b> uit je bliliotheek. <br><br>Bevestig als je wilt doorgaan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5098,26 +5232,32 @@ msgid ""
 "books will be permanently <b>deleted</b> from your calibre library.<br><br>  "
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
+"Boekformaten van de selectie zullen toegevoegd worden in het <b>eerst "
+"geselecteerde boek</b> (%s). ISBN zal <i>niet</i> ingevoegd "
+"worden.<br><br>Na samenvoegen worden het tweede boek en de volgende "
+"<b>verwijderd</b>. Alle boekformaten in het eerst geselcteerde boek worden "
+"behouden en elk duplicaatformaat in de volgende boeken worden<b>permanent "
+"verwijderd</b> uit je bliliotheek. <br><br>Bevestig als je wilt doorgaan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Download nieuws"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
-msgstr "Downloading nieuws van "
+msgstr "Nieuws aan het ophalen van "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " opgehaald"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/help.py:16
 msgid "Browse the calibre User Manual"
-msgstr "Blader door de calibre gebruiksaanwijzing"
+msgstr "Blader door de gebruiksaanwijzing van calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/help.py:16
 msgid "F1"
@@ -5134,7 +5274,7 @@ msgstr "Ga naar volgende overeenkomst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13
 msgid "Move to next highlighted match"
-msgstr ""
+msgstr "Ga naar volgende oplichtende overeenkomst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:354
@@ -5148,11 +5288,11 @@ msgstr "F3"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:25
 msgid "Move to previous item"
-msgstr ""
+msgstr "Ga naar vorig item"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:26
 msgid "Move to previous highlighted item"
-msgstr ""
+msgstr "Ga naar vorig oplichtend item"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:26
 msgid "Shift+N"
@@ -5176,17 +5316,17 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
-msgstr "Start de welkom wizard"
+msgstr "Start de welkomwizard"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:28
 msgid "Restart in debug mode"
-msgstr ""
+msgstr "Herstart in debugmodus"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:43
 msgid "Cannot configure while there are running jobs."
-msgstr "Can niet configueren terwijl bestaande opdrachten bezig zijn"
+msgstr "Can niet configueren terwijl er opdrachten bezig zijn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:48
 msgid "Cannot configure before calibre is restarted."
@@ -5216,17 +5356,17 @@ msgstr "Opslaan op schijf"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:48
 msgid "Save to disk in a single directory"
-msgstr "Opslaan op schijf in een enkele folder"
+msgstr "Opslaan op schijf in een enkele map"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:69
 msgid "Save only %s format to disk"
-msgstr "Bewaar alleen %s formaat op schijf"
+msgstr "Bewaar alleen %s-formaat op schijf"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:72
 msgid "Save only %s format to disk in a single directory"
-msgstr "Bewaar enkel %s formaat op de harde schijf, in één enkele map"
+msgstr "Bewaar enkel %s-formaat op de harde schijf, in één enkele map"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:91
 msgid "Cannot save to disk"
@@ -5242,9 +5382,9 @@ msgid ""
 "corruption of your library. Save to disk is meant to export files from your "
 "calibre library elsewhere."
 msgstr ""
-"U probeert bestanden op te slaan in de Calibre bibliotheek. Dit kan "
-"corruptie van de bibliotheek veroorzaken. De optie 'Opslaan naar schijf' is "
-"ervoor om bestanden uit uw Calibre bibliotheek naar elders te exporteren."
+"Je probeert bestanden op te slaan in de calibrebibliotheek. Dit kan "
+"corruptie van de bibliotheek veroorzaken. De optie 'Opslaan naar schijf'  "
+"dient om bestanden uit je calibrebibliotheek naar elders te exporteren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:136
 msgid "Error while saving"
@@ -5261,12 +5401,12 @@ msgstr "Sommige boeken konden niet worden opgeslagen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:146
 msgid "Click the show details button to see which ones."
-msgstr "Klik de 'laat details zien' knop om te zien welke"
+msgstr "Klik de 'laat details zien'-knop om te zien welke."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:16
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:766
 msgid "Show book details"
-msgstr "Laat boek details zien"
+msgstr "Laat boekdetails zien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:17
 msgid "I"
@@ -5294,7 +5434,7 @@ msgstr "Boeken van dezelfde auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:25
 msgid "Books in this series"
-msgstr "Boeken in deze serie"
+msgstr "Boeken in deze reeks"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:26
 msgid "Alt+Shift+S"
@@ -5323,7 +5463,7 @@ msgstr "Epub aanpassen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:16
 msgid "Make small changes to ePub format books"
-msgstr "Maak kleine veranderen aan Epub boeken"
+msgstr "Maak kleine veranderingen aan Epub-boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:17
 msgid "T"
@@ -5353,7 +5493,7 @@ msgstr "Bekijk specifiek formaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:38
 msgid "Read a random book"
-msgstr ""
+msgstr "Lees een willekeurig boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:181
@@ -5367,7 +5507,7 @@ msgstr "Formaat niet beschikbaar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:106
 msgid "Selected books have no formats"
-msgstr ""
+msgstr "Geselecteerde boeken hebben geen formaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:127
@@ -5379,7 +5519,7 @@ msgid ""
 "Not all the selected books were available in the %s format. You should "
 "convert them first."
 msgstr ""
-"Niet alle geselecteerde boeken waren beschikbaar in %s formaat. Je zult ze "
+"Niet alle geselecteerde boeken waren beschikbaar in %s-formaat. Je zult ze "
 "eerst moeten converteren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:127
@@ -5394,13 +5534,13 @@ msgid ""
 "continue?"
 msgstr ""
 "Je probeert %d boeken te openen. Te veel boeken tegelijkertijd openen kan "
-"veel tijd in belsag nemen, een een negatief effect op de responsiviteit van "
-"je computer. Eenmaal gestart kan dit proces niet worden afgebroken totdat "
-"het klaar is. Wil je verder gaan?"
+"veel tijd in beslag nemen, en een negatief effect op de kwiekheid van 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/view.py:137
 msgid "Cannot open folder"
-msgstr "Kan folder niet openen"
+msgstr "Kan map niet openen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:182
 msgid "%s has no available formats."
@@ -5416,18 +5556,18 @@ msgstr "Toevoegen..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
 msgid "Searching in all sub-directories..."
-msgstr "Zoekend in alle submappen..."
+msgstr "Zoeken in alle deelmappen..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:269
 msgid "Path error"
-msgstr "Pad fout"
+msgstr "Padfout"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
 msgid "The specified directory could not be processed."
-msgstr "De geselecteerde folder kan niet worden bewerkt."
+msgstr "De geselecteerde map kan niet worden bewerkt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Geen boeken"
 
@@ -5448,9 +5588,9 @@ 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 ""
-"Het proces om boeken toe te voegen antwoord niet meer. Probeer calibre "
-"opnieuw op te starten, en voeg daarna boeken toe in kleinere aantallen "
-"totdat je het probleem boek hebt gevonden."
+"Het proces om boeken toe te voegen antwoordt niet meer. Probeer calibre "
+"opnieuw op te starten, en voeg daarna boeken toe in kleinere aantallen tot "
+"je het probleemboek hebt gevonden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:368
 msgid "Duplicates found!"
@@ -5478,7 +5618,7 @@ msgstr "Opgeslagen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:56
 msgid "Searching for sub-folders"
-msgstr "Zoekend naar submappen"
+msgstr "Zoeken naar deelmappen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:61
 msgid "Searching for books"
@@ -5491,19 +5631,19 @@ msgstr "Zoeken naar dubbele bestanden gebaseerd op file hash"
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:70
 msgid "Choose root folder"
-msgstr "Kies de hoofd folder"
+msgstr "Kies een hoofdmap"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:135
 msgid "Invalid root folder"
-msgstr "Foute hoofd folder"
+msgstr "Ongeldige hoofdmap"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:136
 msgid "is not a valid root folder"
-msgstr "is geen goede start folder"
+msgstr "is geen goede hoofdmap"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:146
 msgid "Add books to calibre"
-msgstr "Voeg boeken toe aan Calibre"
+msgstr "Voeg boeken toe aan calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:62
@@ -5516,7 +5656,7 @@ msgstr "Wizardpagina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:27
 msgid "Scanning root folder for books"
-msgstr "Bezig met het zoeken naar boeken in de start folder"
+msgstr "Bezig met het zoeken naar boeken in de hoofdmap"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:28
 msgid "This may take a few minutes"
@@ -5524,11 +5664,11 @@ msgstr "Dit kan enkele minuten duren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
 msgid "Choose the location to add books from"
-msgstr "Kies de plek van de toe te voegen boeken"
+msgstr "Kies de plek van waaruit boeken worden toegevoegd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64
 msgid "Select a folder on your hard disk"
-msgstr "Selecteer een folder op uw harde schijf"
+msgstr "Selecteer een map op je harde schijf"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65
 msgid ""
@@ -5541,26 +5681,26 @@ 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 kan automatisch uw computer op bestaande boeken doorzoeken. Deze "
-"boeken zullen dan naar de calibre bibliotheek (=<b>gekopieerd</b>) worden. "
-"Deze wizard zal u helpen bij het scannen, aanpassen en importeren van uw "
+"<p>calibre kan automatisch je computer op bestaande boeken doorzoeken. Deze "
+"boeken zullen dan naar de calibrebibliotheek (=<b>gekopieerd</b>) worden. "
+"Deze wizard zal je helpen bij het scannen, aanpassen en importeren van je "
 "bestaande collectie boeken.</p>\n"
 "<p>Kies een beginmap. Er zal alleen in deze en onderliggende mappen naar "
 "boeken gezocht worden.</p>\n"
-"<p>Verzeker u ervan dat de map waar calibre uw collectie bewaart zich "
+"<p>Verzeker je ervan dat de map waar calibre je collectie bewaart zich "
 "<b>niet</b> in dit pad bevindt.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:68
 msgid "&Root folder:"
-msgstr "&Start folder:"
+msgstr "&Beginmap:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:69
 msgid ""
 "This folder and its sub-folders will be scanned for books to import into "
 "calibre's library"
 msgstr ""
-"Deze map en de submappen worden gescand op te importeren boeken voor "
-"calibre's bibliotheek"
+"Deze map en de deelmappen worden gescand op te importeren boeken voor "
+"calibres bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:57
@@ -5629,14 +5769,14 @@ msgid ""
 "&One book per folder, assumes every ebook file in a folder is the same book "
 "in a different format"
 msgstr ""
-"&Een boek per folder, neem aan dat elk eboek bestand in een folder hetzelfde "
-"boek in een ander formaat is"
+"&Een boek per map, neem aan dat elk e-boekbestand in een map hetzelfde boek "
+"in een ander formaat is"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:74
 msgid ""
 "&Multiple books per folder, assumes every ebook file is a different book"
 msgstr ""
-"&Meerdere boeken per folder, neem aan dat elk eboek bestand een ander boek is"
+"&Meerdere boeken per map, neem aan dat elk e-boekbestand een ander boek is"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:27
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:54
@@ -5647,8 +5787,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Pad"
 
@@ -5658,17 +5798,17 @@ msgstr "Pad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Collecties"
 
@@ -5678,27 +5818,27 @@ msgid "Click to open"
 msgstr "Klik om te openen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Geen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
-msgstr ""
+msgstr "Plak omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
-msgstr ""
+msgstr "Kopieer omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:483
 msgid "Double-click to open Book Details window"
@@ -5706,7 +5846,7 @@ msgstr "Dubbelklikken om de boekdetails te zien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:16
 msgid "BibTeX Options"
-msgstr "BibTex opties"
+msgstr "Opties voor BibTex"
 
 #: /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
@@ -5754,7 +5894,7 @@ msgstr "uitvoer"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5777,14 +5917,14 @@ msgstr "uitvoer"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5802,7 +5942,7 @@ msgstr "Formulier"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:78
 msgid "Bib file encoding:"
-msgstr "Bib bestand encodering"
+msgstr "Codering bib-bestand:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:43
@@ -5811,23 +5951,23 @@ msgstr "Velden te gebruiken in uitvoer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:80
 msgid "Encoding configuration (change if you have errors) :"
-msgstr "Encoderings instellingen (aan te passen bij fouten)"
+msgstr "Coderingsinstellingen (aan te passen bij fouten)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:81
 msgid "BibTeX entry type:"
-msgstr "Bibtex type ingave"
+msgstr "type Bibtexingave"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:82
 msgid "Create a citation tag?"
-msgstr "Creëer een citaat label?"
+msgstr "Een citaatlabel creëren ?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:83
 msgid "Add files path with formats?"
-msgstr ""
+msgstr "Pad naar bestanden toevoegen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:84
 msgid "Expression to form the BibTeX citation tag:"
-msgstr "Uitdrukking voor het aanmaken van het Bibtex citaatlabel:"
+msgstr "Uitdrukking voor het aanmaken van het citaatlabel voor Bibtex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:85
 msgid ""
@@ -5843,49 +5983,49 @@ msgstr ""
 " -De beschikbare velden zijn 'author_sort', 'authors', 'id',\n"
 "    'isbn', 'pubdate', 'publisher', 'series_index', 'series',\n"
 "   'tags', 'timestamp', 'title', 'uuid'\n"
-" -Voor types van lijsten zal enkel het eerste element\n"
+" -Voor lijstvelden zoals  'authors' en 'tags' zal enkel het eerste element\n"
 "   geselecteerd worden.\n"
 " -Voor het veld tijd zal enkel de datum gebruikt worden. "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
-msgstr "CSV/XML Opties"
+msgstr "Opties CSV/XML"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
 msgid "E-book options"
-msgstr "E-Boek opties"
+msgstr "Opties e-Boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:296
 msgid "Sections to include in catalog."
-msgstr ""
+msgstr "Afdelingen die in catalogus moeten."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:297
 msgid "Included sections"
-msgstr ""
+msgstr "Ingevoegde afdelingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:298
 msgid "Books by &Genre"
-msgstr ""
+msgstr "Boeken per &genre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:299
 msgid "Recently &Added"
-msgstr ""
+msgstr "Recente &aanwinsten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:300
 msgid "&Descriptions"
-msgstr ""
+msgstr "&Beschrijvingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:301
 msgid "Books by &Series"
-msgstr ""
+msgstr "Boeken per &reeks"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:302
 msgid "Books by &Title"
-msgstr ""
+msgstr "Boeken per &titel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:303
 msgid "Books by Author"
-msgstr ""
+msgstr "Boeken per au&teur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:304
 msgid ""
@@ -5894,47 +6034,55 @@ msgid ""
 "excludes tags of the form [tag], \n"
 "e.g., [Project Gutenberg]</p>"
 msgstr ""
+"<p>Standaardpatroon \n"
+"\\[.+\\]\n"
+"sluit labels van de vorm [label] uit, \n"
+"bv. [Project Gutenberg]</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:308
 msgid "Excluded genres"
-msgstr ""
+msgstr "Uitgesloten genres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:309
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:312
 msgid "Tags to &exclude"
-msgstr ""
+msgstr "Uit te sluiten labels"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:310
 msgid ""
 "Books matching either pattern will not be included in generated catalog. "
 msgstr ""
+"Boeken die overeenkomen met een van de patronen worden niet opgenomen in de "
+"catalogus. "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:311
 msgid "Excluded books"
-msgstr ""
+msgstr "Uitgesloten boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:313
 msgid ""
 "<p>Comma-separated list of tags to exclude.\n"
 "Default: ~,Catalog"
 msgstr ""
+"<p>Door komma's gescheiden lijst van uit te sluiten labels.\n"
+"standaard: ~,Catalog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:315
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:320
 msgid "&Column/value"
-msgstr ""
+msgstr "&Kolom/waarde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:316
 msgid "Column containing additional exclusion criteria"
-msgstr ""
+msgstr "kolom met bijkomende uitsluitingscriteria"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:317
 msgid "Exclusion pattern"
-msgstr ""
+msgstr "Uitsluitingspatroon"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:318
 msgid "Matching books will be displayed with a check mark"
-msgstr ""
+msgstr "Overeenkomstige boeken worden aangeduid met een vinkje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:319
 msgid "Read books"
@@ -5946,7 +6094,7 @@ msgstr "Kolom met de 'gelezen' status"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:322
 msgid "'read book' pattern"
-msgstr ""
+msgstr "'gelezen boek'-patroon"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:323
 msgid "Other options"
@@ -5954,19 +6102,19 @@ msgstr "Overige opties"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:324
 msgid "&Wishlist tag"
-msgstr ""
+msgstr "verlanglijstlabel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:325
 msgid "Books tagged as Wishlist items will be displayed with an X"
-msgstr ""
+msgstr "Boeken met het label voor verlanglijst worden getoond met een 'X'"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:326
 msgid "&Thumbnail width"
-msgstr ""
+msgstr "Icoonbreed&te"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:327
 msgid "Size hint for Description cover thumbnails"
-msgstr ""
+msgstr "Hint voor grootte iconen beschrijving omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:328
 msgid " inch"
@@ -5990,23 +6138,23 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:333
 msgid "Merge additional content before Comments"
-msgstr ""
+msgstr "Voeg bijkomende inhoud voor commentaren in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:334
 msgid "&Before"
-msgstr ""
+msgstr "&Voor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:335
 msgid "Merge additional content after Comments"
-msgstr ""
+msgstr "Voeg bijkomende inhoud na commentaren in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:336
 msgid "&After"
-msgstr ""
+msgstr "&Na"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:337
 msgid "Separate Comments and additional content with horizontal rule"
-msgstr ""
+msgstr "scheid commentaat en bijkomende inhoud met horizontale lijn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:338
 msgid "&Separator"
@@ -6014,7 +6162,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:33
 msgid "Tab template for catalog.ui"
-msgstr "Tab sjabloon voor catalog.ui"
+msgstr "Sjabloon tab voor catalog.ui"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:69
 msgid "Bold"
@@ -6030,7 +6178,7 @@ msgstr "Onderstreept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:75
 msgid "Strikethrough"
-msgstr ""
+msgstr "Doorstreept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:77
 msgid "Superscript"
@@ -6062,7 +6210,7 @@ msgstr "Rechts uitlijnen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:92
 msgid "Align justified"
-msgstr ""
+msgstr "lijnen even lang maken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:93
 msgid "Undo"
@@ -6070,11 +6218,11 @@ msgstr "Ongedaan maken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:94
 msgid "Redo"
-msgstr ""
+msgstr "Herdoen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:95
 msgid "Remove formatting"
-msgstr ""
+msgstr "Verwijder formattering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:96
 msgid "Copy"
@@ -6082,39 +6230,39 @@ msgstr "Kopieer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:97
 msgid "Paste"
-msgstr ""
+msgstr "Plak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:98
 msgid "Cut"
-msgstr ""
+msgstr "Knip"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:100
 msgid "Increase Indentation"
-msgstr ""
+msgstr "Vergroot indentatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:102
 msgid "Decrease Indentation"
-msgstr ""
+msgstr "Verklein indentatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:104
 msgid "Select all"
-msgstr ""
+msgstr "Selecteer alles"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:109
 msgid "Foreground color"
-msgstr ""
+msgstr "Voorgrondkleur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:114
 msgid "Background color"
-msgstr ""
+msgstr "Achtergrondkleur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:118
 msgid "Style text block"
-msgstr ""
+msgstr "Styleer tekstblok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:120
 msgid "Style the selected text block"
-msgstr ""
+msgstr "Styleer gelselecteerd tekstblok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:34
@@ -6130,11 +6278,11 @@ msgstr "Standaard"
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:131
 msgid "Heading"
-msgstr ""
+msgstr "Hoofding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:132
 msgid "Pre-formatted"
-msgstr ""
+msgstr "Gepreformatteerd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:133
 msgid "Blockquote"
@@ -6142,11 +6290,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:134
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:141
 msgid "Insert link"
-msgstr ""
+msgstr "Voeg link toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:143
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:79
@@ -6156,27 +6304,27 @@ msgstr "Wissen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:161
 msgid "Choose foreground color"
-msgstr ""
+msgstr "Kies kleur voorgrond"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:167
 msgid "Choose background color"
-msgstr ""
+msgstr "Kies kleur achtergrond"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:172
 msgid "Create link"
-msgstr ""
+msgstr "Creëer link"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:173
 msgid "Enter URL"
-msgstr ""
+msgstr "Geef URL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:523
 msgid "Normal view"
-msgstr ""
+msgstr "Normaal uitzicht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/comments_editor.py:524
 msgid "HTML Source"
-msgstr ""
+msgstr "HTML-broncode"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:40
 msgid ""
@@ -6186,21 +6334,21 @@ msgid ""
 msgstr ""
 "Voor instellingen die niet gemaakt kunnen worden in dit dialoog venster, "
 "gebruik de waarden die opgeslagen zijn tijdens een voormalige conversie "
-"(indien deze bestaan) in plaats van de standaard waarden die zijn opgegeven "
+"(indien deze bestaan) in plaats van de standaardwaarden die zijn opgegeven "
 "onder de voorkeursinstellingen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:74
 msgid "Bulk Convert"
-msgstr "Massa conversie"
+msgstr "Massaconversie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:189
 msgid "Options specific to the output format."
-msgstr "Opties specifiek voor het uitvoer formaat."
+msgstr "Opties specifiek voor het uitvoerformaat."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
-msgstr "Strip invoer"
+msgstr "Stripinvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13
@@ -6212,7 +6360,7 @@ msgstr "invoer"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:104
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
 msgid "&Number of Colors:"
-msgstr "Aantal &Kleuren:"
+msgstr "Aantal &kleuren:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:105
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101
@@ -6232,7 +6380,7 @@ msgstr "Schakel ver&scherping uit"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:109
 msgid "Disable &Trimming"
-msgstr "Schakel &Trimming uit"
+msgstr "Schakel &trimming uit"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:108
@@ -6261,24 +6409,24 @@ msgstr "Ont&spikkel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:114
 msgid "&Disable comic processing"
-msgstr "Schakel strip verwerking uit: &D"
+msgstr "Schakel stripverwerking uit: &D"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:120
 msgid "&Output format:"
-msgstr "Uitv&oer formaat"
+msgstr "Uitv&oerformaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:116
 msgid "Disable conversion of images to &black and white"
-msgstr "Schakel conversie van afbeeldingen naar zwart en wit uit"
+msgstr "Schakel conversie van afbeeldingen naar zwart-wit uit"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:117
 msgid "Override image  &size:"
-msgstr ""
+msgstr "Overschrijf beeldgrootte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:118
 msgid "Don't add links to &pages to the Table of Contents for CBC files"
-msgstr ""
+msgstr "Voeg geen &paginalinks aan de inhoudsopgave toe voor CBC-bestanden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
@@ -6286,20 +6434,20 @@ msgstr "Foutopsporing"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
-msgstr "Zoeken fouten in conversie proces"
+msgstr "Zoeken fouten in conversieproces"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:56
 msgid "Choose debug folder"
-msgstr "Kies fout opsporings folder"
+msgstr "Kies map voor foutopsporing"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Invalid debug directory"
-msgstr "ongeldige folder voor fout opsporing"
+msgstr "Ongeldige map voor foutopsporing"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:59
 msgid "Failed to create debug directory"
-msgstr "fout opsporings folder kan niet worden aangemaakt"
+msgstr "Foutopsporingsmap kan niet worden aangemaakt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:55
 msgid ""
@@ -6308,10 +6456,10 @@ msgid ""
 "understanding the conversion process and figuring out the correct values for "
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
-"Kies de folder om de fout opsporings informatie in op te slaan. Als je een "
-"folder kiest, dan zal calibre hier veel informatie naar toe schrijven. Dit "
-"kan handig zijn om het conversie proces te begrijpen, en correcte waarden te "
-"achterhalen voor de inhoudsopgave en hoofdstuk informatie."
+"Kies de map om de foutopsporingsinformatie in op te slaan. Als je een map "
+"kiest, dan zal calibre hier veel informatie naar toe schrijven. Dit kan "
+"handig zijn om het conversieproces te begrijpen, en correcte waarden te "
+"achterhalen voor de inhoudsopgave en hoofdstukinformatie."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:59
 msgid ""
@@ -6319,29 +6467,29 @@ msgid ""
 "of the conversion process. This HTML can sometimes serve as a good starting "
 "point for hand editing a conversion."
 msgstr ""
-"Het foutopsporings proces schrijft de tussentijdse HTML die word gegenereerd "
-"op diverse stadia van het conversie proces. Deze HTML bestanden kunnen soms "
+"Het foutopsporingsproces schrijft de tussentijdse HTML die word gegenereerd "
+"op diverse stadia van het conversieproces. Deze HTML-bestanden kunnen soms "
 "een goed startpunt opleveren voor het handmatig bewerken van een conversie."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
-msgstr "EPUB Uitvoer"
+msgstr "EPUB-Uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:57
 msgid "Do not &split on page breaks"
-msgstr "&Splits niet op pagina einden"
+msgstr "&Splits niet bij start nieuwe pagina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:58
 msgid "No default &cover"
-msgstr "Geen standaard omslag afbeelding"
+msgstr "Geen standaard omslagafbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:59
 msgid "No &SVG cover"
-msgstr "Geen &SVG omslag"
+msgstr "Geen &SVG-omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:60
 msgid "Preserve cover &aspect ratio"
-msgstr "Bewaar de omslaghoes beeldverhouding"
+msgstr "Bewaar de beeldverhouding van de omslaghoes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:61
 msgid "Split files &larger than:"
@@ -6353,27 +6501,31 @@ msgstr " KB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:63
 msgid "&Flatten EPUB file structure"
-msgstr ""
+msgstr "Maak EPUB-bestandsstructuur vlak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
-msgstr "FB2 invoer"
+msgstr "FB2-invoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:34
 msgid "Do not insert a &Table of Contents at the beginning of the book."
-msgstr "Voeg geen &Inhoudsopgave toe aan het begin van het boek."
+msgstr "Voeg geen &inhoudsopgave toe aan het begin van het boek."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
-msgstr "FB2 uitvoer"
+msgstr "FB2-uitvoer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
+msgstr "Verdeel in paragrafen:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
-msgstr "Lettertype herschalings wizard"
+msgstr "Wizard voor lettertypeherschaling"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:105
 msgid ""
@@ -6391,33 +6543,33 @@ msgid ""
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
 "<p>Deze wizard helpt je om een geschikte lettergrootte te vinden. Typ de "
-"basic lettergrootte van je invoer document, en kies daarna een invoer "
-"lettergrootte. De wizard zal dan laten zien wat de betreffende "
-"lettergroottes uiteindelijk zullen worden nadat het lettertype schalings "
-"algorithme zijn werk heeft gedaan. Je kunt dit algorithme aanpassen door de "
-"uitvoer basis lettergrootte hieronder aan te passen. Als je waarden vindt "
-"die voor je werken, klik dan op OK</p>\n"
-"<p>Standaard, als ze uitvoer basis lettergrootte nul is en/of er geen "
-"lettergrootte is gekozen, dan zal calibre de waarden uit het hudige uitvoer "
-"profiel gebruiken.</p>\n"
+"basislettergrootte van je invoerdocument, en kies daarna een "
+"invoerlettergrootte. De wizard zal dan laten zien wat de betreffende "
+"lettergroottes uiteindelijk zullen worden nadat het "
+"lettertypeschalingsalgoritmezijn werk heeft gedaan. Je kunt dit algoritme "
+"aanpassen door de basislettergrootte voor de uitvoer hieronder aan te "
+"passen. Als je waarden vindt die voor je werken, klik dan op OK</p>\n"
+"<p>Als ze basislettergrootte voor de uitvoer nul is en/of er geen "
+"lettergrootte is gekozen, dan zal calibre standaard de waarden uit het "
+"huidigeuitvoerprofiel gebruiken.</p>\n"
 "<p>Zie de  <a href=\"http://calibre-"
-"ebook.com/user_manual/conversion.html#font-size-rescaling\">Geburikers "
-"Handleiding</a> voor een discussie met betrekking tot de werking van de "
-"lettergrootte herschaling.</p>"
+"ebook.com/user_manual/conversion.html#font-size-"
+"rescaling\">Gebruikershandleiding</a> voor een discussie over "
+"lettergrootteherschaling.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Output document"
-msgstr "Uitvoer d&ocument"
+msgstr "Uitvoerd&ocument"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "&Base font size:"
-msgstr "&Basis letter grootte:"
+msgstr "&Basislettergrootte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:141
 msgid "Font size &key:"
-msgstr "Letter grootte toets:"
+msgstr "Toets lettergrootte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:115
@@ -6436,19 +6588,19 @@ msgstr " pt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:112
 msgid "Use &default values"
-msgstr "Gebruik standaar&d waarden"
+msgstr "Gebruik standaar&dwaarden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid "&Input document"
-msgstr "&Invoer document"
+msgstr "&Invoerdocument"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:116
 msgid "&Font size: "
-msgstr "Letter grootte: "
+msgstr "Lettergrootte: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:118
 msgid " will map to size: "
-msgstr " zal naar grootte schakelen: "
+msgstr " ik schakel naar grootte:: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:119
 msgid "0.0 pt"
@@ -6459,10 +6611,12 @@ msgid ""
 "Heuristic\n"
 "Processing"
 msgstr ""
+"Heuristische\n"
+"verwerking"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics.py:16
 msgid "Modify the document text and structure using common patterns."
-msgstr ""
+msgstr "Verander tekst en structuur van document a.d.h.v. gewone patronen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:113
 msgid ""
@@ -6475,54 +6629,64 @@ msgid ""
 "the <a href=\"http://calibre-ebook.com/user_manual/conversion.html#heuristic-"
 "processing\">User Manual</a>."
 msgstr ""
+"<b>Heuristische verwerking</b> betekent dat calibre in je boek zoekt naar "
+"patronen die gewoonlijk iets aanduiden en dit als structuurinformatie "
+"gebruikt. Zoals de naam zegt gaat het om raden, wat betekent dat het "
+"resultaat slechter kan zijn dan gewoonlijk als calibre verkeerd raadt. "
+"Daarom staat het standaard op 'uit', maar vaak kan heuristiek resultaten "
+"verbeteren als de conversie niet oplevert wat je verwacht. Je vindt meer "
+"informatie over de verschillende verwerkingsopties in de <a "
+"href=\"http://calibre-ebook.com/user_manual/conversion.html#heuristic-"
+"processing\">Gebruikershandleiding</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:114
 msgid "Enable &heuristic processing"
-msgstr ""
+msgstr "Zet &heuristische verwerking aan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:115
 msgid "Heuristic Processing"
-msgstr ""
+msgstr "Heuristische verwerking"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:116
 msgid "Unwrap lines"
-msgstr ""
+msgstr "Plak lijnen achter elkaar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:117
 msgid "Line &un-wrap factor :"
-msgstr ""
+msgstr "Factor voor aaneenplakken lijnen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:118
 msgid "Detect and markup unformatted chapter headings and sub headings"
 msgstr ""
+"Detecteer en formatteer ongeformatteerde (sub)hoofdingen van hoofdstukken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:119
 msgid "Renumber sequences of <h1> or <h2> tags to prevent splitting"
-msgstr ""
+msgstr "Hernummer opeenvolgende <h1>- en <h2>-tags om splitsing te voorkomen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:120
 msgid "Delete blank lines between paragraphs"
-msgstr ""
+msgstr "Verwijder blanco lijnen tussen alinea's"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:121
 msgid "Ensure scene breaks are consistently formatted"
-msgstr ""
+msgstr "Zorg ervoor dat breaks tussen scenes er overal hetzelfde uitzien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:122
 msgid "Replace soft scene &breaks:"
-msgstr ""
+msgstr "Vervang zachte breaks"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:123
 msgid "Remove unnecessary hyphens"
-msgstr ""
+msgstr "Verwijder overbodige liggende streepjes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:124
 msgid "Italicize common words and patterns"
-msgstr ""
+msgstr "Zet gewone woorden en patronen cursief"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:125
 msgid "Replace entity indents with CSS indents"
-msgstr ""
+msgstr "Vervang indentatie door CSS-indentatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
@@ -6530,7 +6694,7 @@ msgstr "Uiterlijk & gedrag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:18
 msgid "Control the look and feel of the output"
-msgstr "Beheers de visualisatie van de uitvoer"
+msgstr "Bepaal de visualisatie van de uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Original"
@@ -6546,11 +6710,11 @@ msgstr "Tekst uitvullen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "&Disable font size rescaling"
-msgstr "Annuleer letter grootte instelling"
+msgstr "Annuleer instelling lettergrootte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:139
 msgid "Base &font size:"
-msgstr "Basis &Letter grootte"
+msgstr "Basis&lettergrootte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:142
 msgid "Wizard to help you choose an appropriate font size key"
@@ -6558,19 +6722,19 @@ msgstr "Wizard om je te helpen een geschikte lettergrootte te kiezen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:144
 msgid "Line &height:"
-msgstr "regel &hoogte:"
+msgstr "regel&hoogte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:146
 msgid "Input character &encoding:"
-msgstr "Invoer karakter &encodering:"
+msgstr "Karakt&ercodering Invoer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:147
 msgid "Remove &spacing between paragraphs"
-msgstr "Verwijder &spaties tussen paragrafen"
+msgstr "Verwijder lege ruimte&s tussen alinea's"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:148
 msgid "Indent size:"
-msgstr "Indentatie grootte:"
+msgstr "Indentatiegrootte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:149
 msgid ""
@@ -6578,9 +6742,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
-"<p>Wanneer calibre paragraaf spatiëring verwijderd, dan krijgt een paragraaf "
-"automatisch een indentatie, om ervoor te zorgen dat deze makkelijk "
-"herkenbaar is. Deze optie beinvloed de breedte van die indentatie."
+"<p>Wanneer calibre spatiëring tussen alinea's verwijdert, dan krijgt een "
+"alinea automatisch een indentatie, om ervoor te zorgen dat deze makkelijk "
+"herkenbaar is. Deze optie beïnvloedt de breedte van die indentatie."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:150
 msgid " em"
@@ -6592,7 +6756,7 @@ msgstr "Uitlijnen van tekst:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:152
 msgid "&Linearize tables"
-msgstr "Split tabellen in regels"
+msgstr "Splits tabellen in regels"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:153
 msgid "Extra &CSS"
@@ -6600,11 +6764,11 @@ msgstr "Extra CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:154
 msgid "&Transliterate unicode characters to ASCII"
-msgstr "&Translitereer Unicode-tekens naar ASCII"
+msgstr "Zet Unicode&tekens om naar ASCII"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:155
 msgid "Insert &blank line"
-msgstr "Voeg lege regel toe"
+msgstr "Voeg &blanco regel toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:156
 msgid "Keep &ligatures"
@@ -6616,15 +6780,15 @@ msgstr "Slimme inter&punctie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:158
 msgid "Minimum &line height:"
-msgstr ""
+msgstr "Minimale &lijnhoogte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:159
 msgid " %"
-msgstr ""
+msgstr " %"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
-msgstr "LRF Uitvoer"
+msgstr "LRF-uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Enable &autorotation of wide images"
@@ -6636,7 +6800,7 @@ msgstr "&Woordruimte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Minimum para. &indent:"
-msgstr "Minimum para. &indentatie:"
+msgstr "Miniale &indent. alinea:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Render &tables as images"
@@ -6644,7 +6808,7 @@ msgstr "Geef &tabellen weer als afbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "Text size multiplier for text in rendered tables:"
-msgstr "Tekst grootte vermenigvuldiger voor gegenereerde tabellen:"
+msgstr "Voor gegenereerde tabellen: tekstgrootte maal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "Add &header"
@@ -6652,11 +6816,11 @@ msgstr "Voeg &koptekst toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "Header &separation:"
-msgstr "Koptekst scheiding:"
+msgstr "Scheiding koptekst:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:131
 msgid "Header &format:"
-msgstr "Koptekst &formaat:"
+msgstr "&Formaat koptekst:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:132
 msgid "&Embed fonts"
@@ -6664,15 +6828,15 @@ msgstr "Voeg l&ettertypen toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:133
 msgid "&Serif font family:"
-msgstr "&Serief lettertype:"
+msgstr "Lettertype met &schreef:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:134
 msgid "S&ans-serif font family:"
-msgstr "S&ans-Serief lettertype:"
+msgstr "S&chreefloos lettertype:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:135
 msgid "&Monospaced font family:"
-msgstr "Proportioneel lettertype:"
+msgstr "Niet-proportioneel lettertype:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:117
@@ -6685,8 +6849,8 @@ msgid ""
 "Set the metadata. The output file will contain as much of this metadata as "
 "possible."
 msgstr ""
-"Stel de metagegevens in. Het uitvoer bestand zal zoveel metagegevens "
-"bevatten als mogelijk is."
+"Stel de metagegevens in. Het uitvoerbestand zal zoveel metagegevens bevatten "
+"als mogelijk is."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:171
@@ -6728,12 +6892,12 @@ msgstr " is geen geldige afbeelding"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:446
 msgid "Book Cover"
-msgstr "Boek Omslag"
+msgstr "Boekomslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:447
 msgid "Change &cover image:"
-msgstr "Verander &Omslag Afbeelding"
+msgstr "Verander &omslagafbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:161
 msgid "Browse for an image to use as the cover of this book."
@@ -6741,7 +6905,7 @@ msgstr "Zoek een afbeelding om als omslag voor dit boek te gebruiken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:163
 msgid "Use cover from &source file"
-msgstr "Gebruik omslag van &bron bestand"
+msgstr "Gebruik omslag van &bronbestand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408
@@ -6781,7 +6945,7 @@ msgstr "&Uitgeverij "
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:429
 msgid "Ta&gs: "
-msgstr "Ta&gs "
+msgstr "&Labels: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:537
@@ -6790,7 +6954,7 @@ msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any words or phrases, separated by commas."
 msgstr ""
-"Tags bepalen de categorie van het boek. Dit kan handig zijn tijdens het "
+"Labels bepalen de categorie van het boek. Dit kan handig zijn tijdens het "
 "zoeken. <br><br>Ze kunnen woorden of zinsdelen bevatten, gescheiden door "
 "komma's."
 
@@ -6800,7 +6964,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:214
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:293
 msgid "&Series:"
-msgstr "&Series:"
+msgstr "&Reeks:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
@@ -6810,7 +6974,7 @@ msgstr "&Series:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:435
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:292
 msgid "List of known series. You can add new series."
-msgstr "Lijst van bekende series. Je kunt nieuwe series toevoegen."
+msgstr "Lijst van bekende reeksen. Je kunt nieuwe reeksen toevoegen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:438
@@ -6819,7 +6983,7 @@ msgstr "Boek "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:19
 msgid "MOBI Output"
-msgstr "MOBI uitvoer"
+msgstr "MOBI-uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:44
 msgid "Default"
@@ -6831,15 +6995,15 @@ msgstr "&Titel voor inhoudsopgave:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:76
 msgid "Rescale images for &Palm devices"
-msgstr "Afbeeldingen herschalen voor &Palm apparatuur"
+msgstr "Afbeeldingen herschalen voor &Palmapparaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:77
 msgid "Use author &sort for author"
-msgstr "Gebruik auteur &sortering als auteur"
+msgstr "Gebruik &sorteerauteur als auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:78
 msgid "Disable compression of the file contents"
-msgstr "Gebruik geen compressie van bestand onderdelen"
+msgstr "Gebruik geen compressie van bestandsinhoud"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:79
 msgid "Do not add Table of Contents to book"
@@ -6847,7 +7011,7 @@ msgstr "Voeg geen inhoudsopgave toe aan het boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:80
 msgid "Kindle options"
-msgstr "Kindle opties"
+msgstr "Opties voor Kindle"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:81
 msgid "Periodical masthead font:"
@@ -6855,27 +7019,27 @@ msgstr "lettertype voor titelkoppen van periodieken:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:82
 msgid "Personal Doc tag:"
-msgstr "Tag voor persoonlijk document:"
+msgstr "Label voor persoonlijk document:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:83
 msgid "Ignore &margins"
-msgstr ""
+msgstr "Negeer marges"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
-msgstr "Pagina Instellingen"
+msgstr "Pagina-instellingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:121
 msgid "&Output profile:"
-msgstr "&Uitvoer profiel:"
+msgstr "&Uitvoerprofiel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "Profile description"
-msgstr "Profiel omschrijving"
+msgstr "Omschrijving profiel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:123
 msgid "&Input profile:"
-msgstr "&Invoer profiel:"
+msgstr "&Invoerprofiel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "Margins"
@@ -6899,15 +7063,15 @@ msgstr "&Onder:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:37
 msgid "Treat each &line as a paragraph"
-msgstr "Behandel iedere regel als een paragraaf"
+msgstr "Behandel iedere regel als een alinea"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:38
 msgid "Assume print formatting"
-msgstr "Neem print formatering aan"
+msgstr "Veronderstel printformattering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:14
 msgid "PDB Output"
-msgstr "PDB Uitvoer"
+msgstr "PDB-Uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:48
 msgid "&Format:"
@@ -6923,27 +7087,27 @@ msgstr "&Inline inhoudsopgave"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pmlz_output_ui.py:49
 msgid "Output Encoding:"
-msgstr ""
+msgstr "Codering uitvoer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
-msgstr "PDF invoer"
+msgstr "PDF-invoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:44
 msgid "Line &Un-Wrapping Factor:"
-msgstr "Regel uitpak factor:"
+msgstr "Factor om lijnen aaneen te &plakken:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:45
 msgid "No &Images"
-msgstr "Geen &Afbeeldingen"
+msgstr "Geen &afbeeldingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:15
 msgid "PDF Output"
-msgstr "PDf Uitvoer"
+msgstr "PDF-uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:48
 msgid "&Paper Size:"
-msgstr "&Papier Grootte:"
+msgstr "&Papiergrootte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:49
 msgid "&Orientation:"
@@ -6951,11 +7115,11 @@ msgstr "&Orientatie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:50
 msgid "Preserve &aspect ratio of cover"
-msgstr "Behoud Omslag &Beeldverhouding"
+msgstr "Behoud &beeldverhouding omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pml_output.py:14
 msgid "PMLZ Output"
-msgstr "PMLZ Uitvoer"
+msgstr "PMLZ-Uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pmlz_output_ui.py:48
 msgid "Do not reduce image size and depth"
@@ -6963,15 +7127,15 @@ msgstr "Verminder afbeeldingsgrootte en diepte niet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
-msgstr "RB Uitvoer"
+msgstr "RB-Uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:133
 msgid "No formats available"
-msgstr "Gene formaten beschikbaar"
+msgstr "Geen formaten beschikbaar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:134
 msgid "Cannot build regex using the GUI builder without a book."
-msgstr "Kan geen reguliere expressie maken met de Regex Maker zonder boek."
+msgstr "Kan geen regexp maken met de Regexmaker zonder boek."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:153
 msgid "Open book"
@@ -6979,20 +7143,20 @@ msgstr "Open boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:90
 msgid "Regex Builder"
-msgstr "Regex Maker"
+msgstr "Regexmaker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:91
 msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:93
 msgid "Occurrences:"
-msgstr ""
+msgstr "Gevonden plaatsen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:94
 msgid "0"
@@ -7000,7 +7164,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:95
 msgid "Goto:"
-msgstr ""
+msgstr "Ga naar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:96
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:81
@@ -7024,36 +7188,39 @@ msgid ""
 "&\n"
 "Replace"
 msgstr ""
+"Zoek\n"
+"&\n"
+"vervang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace.py:36
 msgid "&Search Regular Expression"
-msgstr ""
+msgstr "Regexp voor &zoeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:101
 msgid "Invalid regular expression"
-msgstr "Ongeldige reguliere expressie"
+msgstr "Ongeldige regexp"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:102
 msgid "Invalid regular expression: %s"
-msgstr "Ongeldige reguliere expressie: %s"
+msgstr "Ongeldige regexp: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:148
 msgid "First expression"
-msgstr ""
+msgstr "Eerste regexp"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:153
 msgid "&Replacement Text"
-msgstr ""
+msgstr "Ver&rvangtekst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:150
 msgid "Second Expression"
-msgstr ""
+msgstr "Tweede regexp"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:152
 msgid "Third expression"
@@ -7067,6 +7234,11 @@ msgid ""
 "clicking the wizard buttons below will allow you to test your regular "
 "expression against the current input document."
 msgstr ""
+"<p>Zoek & Vervang gebruikt regexps,<i> reguliere uitdrukkingen</i>. Lees de "
+"<a href=\"http://calibre-ebook.com/user_manual/regexp.html\">regular "
+"expressions tutorial</a> om aan de slag te gaan met regexps. Het gebruik van "
+"de wizardknoppen hieronder zal je ook toelaten om je regexp te testen aan de "
+"hand van het huidige invoerdocument."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:173
 msgid "Convert"
@@ -7074,7 +7246,7 @@ msgstr "Converteren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:200
 msgid "Options specific to the input format."
-msgstr "Op[ties specifiek voor het invoer formaat."
+msgstr "Opties specifiek voor het invoerformaat."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:76
@@ -7086,15 +7258,15 @@ msgstr "Dialoogvenster"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:118
 msgid "&Input format:"
-msgstr "&Invoer formaat:"
+msgstr "&Invoerformaat:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:119
 msgid "Use &saved conversion settings for individual books"
-msgstr "Gebruik opge&slagen conversie instellingen voor individuele boeken"
+msgstr "Gebruik opge&slagen conversie-instellingen voor individuele boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/snb_output.py:14
 msgid "SNB Output"
-msgstr "SNB Output"
+msgstr "SNB-uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/snb_output_ui.py:43
 msgid "Hide chapter name"
@@ -7102,37 +7274,37 @@ msgstr "Verberg hoofdstuknaam"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/snb_output_ui.py:44
 msgid "Don't indent the first line for each paragraph"
-msgstr ""
+msgstr "Geen indentatie voor eerste kijn van alinea's"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/snb_output_ui.py:45
 msgid "Insert empty line between paragraphs"
-msgstr "Voeg lege regels toe tussen paragrafen"
+msgstr "Voeg lege regels toe tussen alinea's"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/snb_output_ui.py:46
 msgid "Optimize for full-sceen view "
-msgstr ""
+msgstr "Optimaliseer voor volledig scherm "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:15
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
-"Structuur\n"
-"Detectie"
+"Structuur-\n"
+"detectie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Fine tune the detection of chapter headings and other document structure."
 msgstr ""
-"Werk met de detectie van hoofdstuk kopteksten en andere document structuur."
+"Verfijn  de detectie van hoofdstukkopteksten en andere documentstructuur."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:31
 msgid "Detect chapters at (XPath expression):"
-msgstr "Detecteer hoofdstukken op (XPath expressie):"
+msgstr "Detecteer hoofdstukken op (XPathuitdrukking):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:32
 msgid "Insert page breaks before (XPath expression):"
-msgstr "Voeg pagina einden in voor (XPath expressie):"
+msgstr "Start nieuwe pagina in voor (XPathuitdrukking):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:39
@@ -7142,11 +7314,11 @@ msgstr "Ongelding XPath"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:43
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:40
 msgid "The XPath expression %s is invalid."
-msgstr "De XPath expressie %s is ongeldig"
+msgstr "De XPathuitdrukking %s is ongeldig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
-msgstr "Hoofdstuk &markering:"
+msgstr "&Markering hoofdstuk:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
@@ -7163,10 +7335,14 @@ msgid ""
 "to use these options. Leave the replace field blank and enter your "
 "header/footer removal regexps into the search field."
 msgstr ""
+"Verwijderen van paginahoofding en -voet zijn vervangen door Zoek & Vervang. "
+"Gebruik de Zoek-&-vervangknop aan de linkerkant om dit te gebruiken. Laat "
+"het veld `Vervangtekst' leeg en tik je regexps om hoofding en/of voet te "
+"zoeken in het zoekveld."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove &fake margins"
-msgstr ""
+msgstr "Verwijder &foute marges"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
@@ -7180,15 +7356,15 @@ msgstr "Instellingen voor de creatie/conversie van de inhoudsopgave."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &1 TOC (XPath expression):"
-msgstr "Niveau &1 Inhoudsopgave (XPath expressie):"
+msgstr "Niveau &1 Inhoudsopgave (XPathuitdrukking):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &2 TOC (XPath expression):"
-msgstr "Niveau &2 Inhoudsopgave (XPath expressie):"
+msgstr "Niveau &2 Inhoudsopgave (XPathuitdrukking):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:32
 msgid "Level &3 TOC (XPath expression):"
-msgstr "Niveau &3 Inhoudsopgave (XPath expressie):"
+msgstr "Niveau &3 Inhoudsopgave (XPathuitdrukking):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:68
 msgid "Do not add &detected chapters to the Table of Contents"
@@ -7200,7 +7376,7 @@ msgstr "Aantal &links toe te voegen aan de inhoudsopgave"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:70
 msgid "Chapter &threshold"
-msgstr "Hoofdstuk &drempel"
+msgstr "&Drempel aantal hoofdstukken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:71
 msgid "&Force use of auto-generated Table of Contents"
@@ -7208,27 +7384,27 @@ msgstr "&Forceer gebruik van auto-gegenereerde inhoudsopgave"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:72
 msgid "TOC &Filter:"
-msgstr "Inhoudsopgave &Filter:"
+msgstr "&Filter inhoudsopgave:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
-msgstr "TXT Invoer"
+msgstr "TXT-invoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:92
 msgid "Structure"
-msgstr ""
+msgstr "Structuur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:93
 msgid "Paragraph style:"
-msgstr ""
+msgstr "Stijl voor alinea's:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:94
 msgid "Formatting style:"
-msgstr ""
+msgstr "Formatteerstijl"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:95
 msgid "Common"
-msgstr ""
+msgstr "Gemeenschappelijk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:96
 msgid "Preserve &spaces"
@@ -7236,7 +7412,7 @@ msgstr "Behoud &spaties"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:97
 msgid "Remove indents at the beginning of lines"
-msgstr ""
+msgstr "Verwijder indentatie aan begin van een lijn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:98
 msgid "Markdown"
@@ -7248,20 +7424,19 @@ msgid ""
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 msgstr ""
-"<p>Markdown is een simpele markatie taal voor tekst bestanden, dat "
-"geavanceerde formattering ondersteund. Bezoek <a "
+"<p>Markdown is een simpele markeertaal voor tekstbestanden, die geavanceerde "
+"formattering ondersteunt. Bezoek <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a> om hier "
 "meer over te leren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:100
 msgid "Do not insert Table of Contents into output text when using markdown"
 msgstr ""
-"Voeg geen inhoudsopgave toe aan de uitvoer tekst wanneer een markdown word "
-"gebruikt"
+"Voeg geen inhoudsopgave toe aan de uitvoer als Markdown wordt gebruikt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:13
 msgid "TXT Output"
-msgstr "TXT Uitvoer"
+msgstr "TXT-Uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:85
 msgid "General"
@@ -7269,23 +7444,23 @@ msgstr "Algemeen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:86
 msgid "Output &Encoding:"
-msgstr ""
+msgstr "Cod&ering uitvoer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:87
 msgid "&Line ending style:"
-msgstr "&Regel einde stijl:"
+msgstr "Stijl einde &regel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:88
 msgid "&Formatting:"
-msgstr ""
+msgstr "&Formattering:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:89
 msgid "Plain"
-msgstr ""
+msgstr "Vlak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:90
 msgid "&Maximum line length:"
-msgstr "&Maximum regel lengte:"
+msgstr "&Maximale regellengte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:91
 msgid "Force maximum line length"
@@ -7297,15 +7472,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:94
 msgid "Do not remove links (<a> tags) before processing"
-msgstr ""
+msgstr "Verwijder links (<a>-tags) niet voor verwerking"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:95
 msgid "Do not remove image references before processing"
-msgstr ""
+msgstr "Verwijder verwijzingen naar afbeeldingen niet voor verwerking"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txtz_output.py:12
 msgid "TXTZ Output"
-msgstr ""
+msgstr "TXTZ-uitvoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:77
@@ -7320,11 +7495,11 @@ msgstr "TekstLabel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:56
 msgid "Use a wizard to help construct the Regular expression"
-msgstr ""
+msgstr "Gebruik een wizard om de regexp te maken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "Match HTML &tags with tag name:"
-msgstr "Match HTML &tags met tag naam:"
+msgstr "Match HTML-&tags met tag naam:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "*"
@@ -7384,7 +7559,7 @@ msgstr "Met &waarde:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:88
 msgid "(A regular expression)"
-msgstr "(Een reguliere expressie)"
+msgstr "(Een regexp)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:89
 msgid ""
@@ -7395,21 +7570,21 @@ 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>Bijvoorbeeld, om alls h2 tags te vinden met een class=\"chapter\", "
+"<p>Bijvoorbeeld, om alle h2 tags te vinden met een class=\"chapter\", "
 "gebruik <i>h2</i> als tag, <i>class</i> als attribuut en <i>chapter</i> als "
-"waarde.</p>Het leeglaten van attribuut zal ieder atribuut vinden, en het "
-"leeglaten van de waarde zal alle waarden vinden. Om op alle tags te zoeken, "
+"waarde.</p>Attribuut niet invullen zal ieder atribuut vinden, en het niet "
+"invullen van de waarde zal alle waarden vinden. Om op alle tags te zoeken, "
 "gebruik * als tag.</p><p>voor moor geavanceerd gebruik van XPath, zie de  <a "
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath "
 "Handleiding</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:128
 msgid "Browse by covers"
-msgstr "Zoek op omslag afbeelding"
+msgstr "Zoek op omslagafbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:158
 msgid "Cover browser could not be loaded"
-msgstr "Kan de omslag browser niet laden"
+msgstr "Kan de omslagbrowser niet laden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:88
@@ -7452,7 +7627,7 @@ msgstr "Zet '%s' op vandaag"
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:669
 msgid "Clear '%s'"
-msgstr ""
+msgstr "Maak '%s' leeg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:297
 msgid " index:"
@@ -7463,14 +7638,16 @@ msgid ""
 "The enumeration \"{0}\" contains an invalid value that will be set to the "
 "default"
 msgstr ""
+"Nummerveld \"{0}\" bevat een ongeldige waarde die wordt vervangen door de "
+"standaardwaarde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:520
 msgid "Apply changes"
-msgstr ""
+msgstr "Pas veranderingen toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:713
 msgid "Remove series"
-msgstr "Verwijder serienaam"
+msgstr "Verwijder reeksnaam"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:716
 msgid "Automatically number books"
@@ -7478,13 +7655,15 @@ msgstr "Nummer boeken automatisch"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:719
 msgid "Force numbers to start with "
-msgstr "Laat de nummering beginnen bij : "
+msgstr "Laat de nummering beginnen bij: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:790
 msgid ""
 "The enumeration \"{0}\" contains invalid values that will not appear in the "
 "list"
 msgstr ""
+"Nummerveld \"{0}\" bevat ongeldige waarden die niet in de lijst worden "
+"opgenomen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:834
 msgid "Remove all tags"
@@ -7509,11 +7688,11 @@ msgstr "Apparaat niet meer verbonden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:310
 msgid "Get device information"
-msgstr "Lees apparaat informatie"
+msgstr "Lees apparaatinformatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:324
 msgid "Get list of books on device"
-msgstr "Lees boeken lijst van apparaat"
+msgstr "Lees boekenlijst van apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:334
 msgid "Get annotations from device"
@@ -7525,7 +7704,7 @@ msgstr "Verstuur metagegevens naar apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:351
 msgid "Send collections to device"
-msgstr "Stuur de collectie(s) naar apparaat"
+msgstr "Stuur collectie(s) naar apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:386
 msgid "Upload %d books to device"
@@ -7545,7 +7724,7 @@ msgstr "Bekijk boek op apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
 msgid "Set default send to device action"
-msgstr "Stel standaard stuur naar apparaat actie in"
+msgstr "Stel standaard 'stuur naar apparaat'-actie in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:475
 msgid "Send to main memory"
@@ -7553,11 +7732,11 @@ msgstr "Stuur naar hoofdgeheugen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:477
 msgid "Send to storage card A"
-msgstr "Zend naar opslag kaart A"
+msgstr "Stuur naar geheugenkaart A"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:479
 msgid "Send to storage card B"
-msgstr "Zend naar opslag kaart B"
+msgstr "Stuur naar geheugenkaart B"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:484
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:493
@@ -7566,15 +7745,15 @@ msgstr "Hoofdgeheugen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:505
 msgid "Send specific format to"
-msgstr "Zend specifiek formaat naar"
+msgstr "Stuur specifiek formaat naar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:506
 msgid "Send and delete from library"
-msgstr "Verzend en verwijder uit de bibliotheek"
+msgstr "Verstuur en verwijder uit de bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:549
 msgid "Eject device"
-msgstr "Verbreek apparaat verbinding"
+msgstr "Verbreek verbinding met apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:611
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:41
@@ -7587,21 +7766,21 @@ msgstr "Fout"
 msgid "Error communicating with device"
 msgstr "Fout bij communicatie met lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Geen geschikte formaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
-msgstr "Selecteer de \"als apparaat\" te openen map"
+msgstr "Selecteer map om als apparaat te openen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Fout bij communicatie met lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7609,68 +7788,68 @@ 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Apparaat: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " gedetecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /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:858
-msgid "%i of %i Books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
-msgid "0 of %i Books"
-msgstr ""
+msgid "%i of %i Books"
+msgstr "%i van %i boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
+msgid "0 of %i Books"
+msgstr "0 van %i boeken"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Kies formaat om naar apparaat te versturen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Geen apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
-msgid "Cannot send: No device is connected"
-msgstr "Kan niet zenden: geen apparaat beschikbaar"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+msgid "Cannot send: No device is connected"
+msgstr "Kan niet versturen: geen apparaat beschikbaar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Geen kaart aanwezig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
-msgstr "Kan niet versturen: Apparaat heeft geen opslag kaart"
+msgstr "Kan niet versturen: Apparaat heeft geen opslagkaart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Verstuur catalogus naar apparaat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Versturen van nieuws naar apparaat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Boeken worden naar de lezer verzonden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7679,11 +7858,11 @@ msgstr ""
 "er geen geschikte bestandsformaten konden worden gevonden. Converteer "
 "boek(en) eerst naar een formaat dat word ondersteund door je lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Geen schijfruimte op de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7700,6 +7879,9 @@ msgid ""
 "support them. If you send these formats to your {1} they may not work. Are "
 "you sure?"
 msgstr ""
+"Je hebt de <b>{0}</b>-formaten geactiveerd voor je {1}. Misschien "
+"ondersteunt je {1} ze niet en zullen ze niet werken als je ze verstuurt. Ben "
+"je zeker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:402
@@ -7724,14 +7906,17 @@ msgid ""
 "If checked, books are placed into sub directories based on their metadata on "
 "the device. If unchecked, books are all put into the top level directory."
 msgstr ""
+"Als dit is aangevinkt worden boeken in deelmappen gestoken op basis van "
+"metagegevens op het apparaat, anders worden alle boeken in de hoofdmap "
+"gestoken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
 msgid "Use sub directories"
-msgstr "Gebruik submappen"
+msgstr "Gebruik deelmappen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Use author sort for author"
-msgstr "Gebruik auteur sortering voor auteur"
+msgstr "Gebruik sorteerauteur voor auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
@@ -7747,11 +7932,11 @@ msgstr "Hoeveel lege boeken moeten worden toegevoegd?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:33
 msgid "Set the author of the new books to:"
-msgstr ""
+msgstr "Stel de auteur van de nieuwe boeken in op:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:45
 msgid "Reset author to Unknown"
-msgstr ""
+msgstr "Stel auteur op 'Onbekend' in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn_ui.py:63
 msgid "Add books by ISBN"
@@ -7771,14 +7956,22 @@ msgid ""
 "enter the full path to the file after a <code>>></code>.  For example:</p>\n"
 "<p><code>9788842915232 >> %s</code></p>"
 msgstr ""
+"<p>geef een lijst van ISBN's in het vak links. Calibre creëert automatisch "
+"records voor deze boeken gebaseerd op ISBN en downloadt hun metagegevens en "
+"omslagen.</p>\n"
+"<p>Ongeldige ISBN's in de lijst worden genegeerd.</p>\n"
+"<p>Je kan bij een ISBN ook een bestand opgeven om toe te voegen. Daarvoor "
+"tik je het volledige pad naar het bestand na een <code>>></code>, "
+"bijvoorbeeld </p>\n"
+"<p><code>9788842915232 >> %s</code></p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn_ui.py:69
 msgid "&Tags to set on created book entries:"
-msgstr ""
+msgstr "&Labels om op gecreëerde boekrecords aan te brengen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:80
 msgid "Fit &cover within view"
-msgstr "Pas de &omslag in het overzicht"
+msgstr "Pas de &omslag in het kader"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:33
 msgid "My Books"
@@ -7795,13 +7988,13 @@ msgstr "Genereer catalogus voor {0} boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:94
 msgid "Catalog &format:"
-msgstr "Catalogic &formaat:"
+msgstr "Catalogus&formaat:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:95
 msgid ""
 "Catalog &title (existing catalog with the same title will be replaced):"
 msgstr ""
-"Catalogus &titel (bestaande catalogus met dezelfde titel zal worden "
+"Catalogus&titel (bestaande catalogus met dezelfde titel zal worden "
 "vervangen):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:96
@@ -7810,24 +8003,24 @@ msgstr "&Verstuur catalogus automatisch naar apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:97
 msgid "Catalog options"
-msgstr "Catalogus opties"
+msgstr "Opties catalogus"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:26
 msgid "Checking database integrity"
-msgstr "Verifieren database integriteit"
+msgstr "Verifieren integriteit database"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:55
 msgid "Dumping database to SQL"
-msgstr ""
+msgstr "Databank wordt naar SQL gedumpt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:81
 msgid "Loading database from SQL"
-msgstr ""
+msgstr "Databank wordt uit SQL ingeladen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:148
 msgid "Check Library -- Problems Found"
-msgstr ""
+msgstr "Controleer bibliotheek -- Er zijn problemen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:158
 msgid ""
@@ -7913,7 +8106,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:226
 msgid "&Run the check again"
-msgstr ""
+msgstr "Cont&roleer nog eens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:229
 msgid "Copy &to clipboard"
@@ -7921,7 +8114,7 @@ msgstr "Kopieer naar klembord &t"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:236
 msgid "Delete marked files (checked subitems)"
-msgstr ""
+msgstr "Verwijder aangeduide bestanden (aangevinkte subitems)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:242
 msgid "Fix marked sections (checked fixable items)"
@@ -7945,8 +8138,8 @@ msgid ""
 "Enter comma-separated extensions without a leading dot. Used only in book "
 "folders"
 msgstr ""
-"Geef kommagescheiden extensies op zonder een voorgaande punt. Werkt alleen "
-"in mappen met boeken"
+"Geef extensies op zonder een voorgaande punt en gescheiden door komma's. "
+"Werkt alleen in mappen met boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:314
 msgid "(fixable)"
@@ -7977,21 +8170,21 @@ msgstr "Kies Formaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:50
 msgid "Existing"
-msgstr ""
+msgstr "Bestaand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:51
 msgid "Convertible"
-msgstr ""
+msgstr "Omzetbaar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:43
 msgid "Choose location for calibre library"
-msgstr "Zoek locatie voor calibre bibliotheek"
+msgstr "Zoek locatie voor calibrebibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:50
 msgid "Same as current"
@@ -7999,7 +8192,7 @@ msgstr "Zelfde als huidige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:51
 msgid "The location %s contains the current calibre library"
-msgstr "De locatie %s bevat de huidige calibre bibliotheek"
+msgstr "De locatie %s bevat de huidige calibrebibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:56
 msgid "No existing library found"
@@ -8007,7 +8200,7 @@ msgstr "Geen bestaande bibliotheek gevonden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:57
 msgid "There is no existing calibre library at %s"
-msgstr "Er bevindt zich geen bestaande calibre bibliotheek in %s"
+msgstr "Er bevindt zich geen bestaande calibrebibliotheek in %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:61
 msgid "Not empty"
@@ -8036,11 +8229,11 @@ msgstr "%s is geen bestaande map"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:77
 msgid "Choose your calibre library"
-msgstr "Kies je calibre bibliotheek"
+msgstr "Kies je calibrebibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:78
 msgid "Your calibre library is currently located at {0}"
-msgstr "Je calibre bibliotheek bevindt zich in {0}"
+msgstr "Je calibrebibliotheek bevindt zich in {0}"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:79
 msgid "New &Location:"
@@ -8056,13 +8249,15 @@ msgstr "&Creëer een lege bibliotheek op de nieuwe locatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:82
 msgid "&Copy structure from the current library"
-msgstr ""
+msgstr "Kopieer structuur van huidige bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:83
 msgid ""
 "Copy the custom columns, saved searches, column widths, plugboards,\n"
 "user categories, and other information from the old to the new library"
 msgstr ""
+"Kopieer aangepaste kolommen, bewaarde zoekopdrachten, kolombreedtes,\n"
+"gebruikerscategorieën en andere info van de oude bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:85
 msgid "&Move current library to new location"
@@ -8070,21 +8265,23 @@ msgstr "&Verplaats de huidige bibliotheek naar de nieuwe locatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_plugin_toolbars.py:23
 msgid "Add \"%s\" to toolbars or menus"
-msgstr ""
+msgstr "Voeg \"%s\" aan werkbalken of menu's toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_plugin_toolbars.py:29
 msgid "Select the toolbars and/or menus to add <b>%s</b> to:"
-msgstr ""
+msgstr "Selecteer werkbalken en/of menu's om <b>%s</b> toe te voegen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_plugin_toolbars.py:45
 msgid ""
 "You can also customise the plugin locations using <b>Preferences -> "
 "Customise the toolbar</b>"
 msgstr ""
+"Je kan ook de plaatsen voor plug-ins aanpassen met <b>Voorkeuren -> Werkbalk "
+"aanpassen</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
-msgstr "Zet standaarden voor conversie van comics (CBR/CBZ bestanden)"
+msgstr "Zet standaarden voor conversie van strips (CBR/CBZ-bestanden)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 msgid "Set options for converting %s"
@@ -8113,7 +8310,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Annuleer"
 
@@ -8124,7 +8321,7 @@ msgstr "Bewerk Commentaar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_location_ui.py:62
 msgid "Where do you want to delete from?"
-msgstr ""
+msgstr "Waaruit wil je verwijderen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_location_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:63
@@ -8139,7 +8336,7 @@ msgstr "Apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_location_ui.py:65
 msgid "Library and Device"
-msgstr ""
+msgstr "Bibliotheek en apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:55
 msgid "&Show this warning again"
@@ -8162,8 +8359,8 @@ msgid "Location"
 msgstr "Locatie"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8178,7 +8375,7 @@ msgstr "Van apparaat verwijderen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/drm_error_ui.py:54
 msgid "This book is DRMed"
-msgstr ""
+msgstr "Dit boek heeft DRM"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/drm_error_ui.py:55
 msgid ""
@@ -8189,24 +8386,30 @@ msgid ""
 "          available at <a href=\"http://drmfree.calibre-ebook.com\">Open "
 "Books</a>."
 msgstr ""
+"<p>Dit boek is versleuteld door <b>DRM</b>. Om meer te leren over DRM "
+"enwaarom je dit boek niet met calibre kan lezen of converteren  cannot read "
+"or convert this book in calibre, \n"
+"          <a href=\"http://drmfree.calibre-ebook.com/about#drm\">klik "
+"hier</a>.<p>Veel recente uitgaven zonder DRM zijn te verkrijgen bij          "
+"<a href=\"http://drmfree.calibre-ebook.com\">Open Books</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:35
 msgid "Author sort"
-msgstr "auteur sortering"
+msgstr "sorteerauteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Ongeldige auteursnaam"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Auteursnamen kunnen geen &-teken bevatten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:74
 msgid "Manage authors"
-msgstr "Auteur beheer"
+msgstr "Auteurbeheer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:75
 msgid "Sort by author"
@@ -8214,7 +8417,7 @@ msgstr "Gesorteerd op auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:76
 msgid "Sort by author sort"
-msgstr "Sorteer op auteurssoort"
+msgstr "Sorteer op sorteerauteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:77
 msgid ""
@@ -8222,24 +8425,30 @@ msgid ""
 "generated from the author. Exactly how this value is automatically\n"
 "generated can be controlled via Preferences->Advanced->Tweaks"
 msgstr ""
+"Vervang alle waarden voor sorteerauteur op een waarde berekend uit het veld "
+"auteur. Hoe die waardeomzetting juist gebeurt kan ingesteld worden met "
+"Voorkeuren->geavanceerd->Tweaks."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:80
 msgid "Recalculate all author sort values"
-msgstr "Herbereken alle auteurssorteerwaarden"
+msgstr "Herbereken alle sorteerauteurwaarden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:81
 msgid ""
 "Copy author sort to author for every author. You typically use this button\n"
 "after changing Preferences->Advanced->Tweaks->Author sort name algorithm"
 msgstr ""
+"Kopieer sorteerauteur naar auteur voor elke auteur. Typisch doe je dit na "
+"het aanpassen van Voorkeuren->geavanceerd->Tweaks->algoitme voor "
+"auteursorteren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:83
 msgid "Copy all author sort values to author"
-msgstr ""
+msgstr "Kopieer alle sorteerauteurwaarden naar auteur."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
 msgid "Author Sort"
-msgstr "Auteur sortering"
+msgstr "Sorteerauteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
@@ -8252,7 +8461,7 @@ msgstr "Heeft Omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:67
 msgid "Has Summary"
-msgstr "Heeft Opsomming"
+msgstr "Heeft samenvatting"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:192
 msgid "Finding metadata..."
@@ -8298,14 +8507,14 @@ msgid ""
 "<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
 "below."
 msgstr ""
-"<p>calibre kan metagegevens voor uw boeken in twee locaties vinden: "
-"<b>Google Books</b> en <b>isbndb.com</b>. <p>On isbndb.com te gebruiken zul "
+"<p>calibre kan metagegevens voor je boeken in twee locaties vinden: "
+"<b>Google Books</b> en <b>isbndb.com</b>. <p>Om isbndb.com te gebruiken zul "
 "je eerst op <a href=\"http://www.isbndb.com\"> een gratis account</a> moeten "
-"aanvragen en daarna je wachtwoord hieronder op geven."
+"aanvragen en daarna je wachtwoord hieronder opgeven."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:95
 msgid "&Access Key:"
-msgstr "&Toegangs Sleutel:"
+msgstr "&Toegangssleutel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:96
 msgid "Fetch"
@@ -8319,14 +8528,13 @@ msgstr "Resultaten"
 msgid ""
 "Select the book that most closely matches your copy from the list below"
 msgstr ""
-"Selecteer het boek dat het meest overeenkomt met dat van jou uit de lijst "
+"Selecteer het boek dat het best overeenkomt met dat van jou uit de lijst "
 "hieronder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:99
 msgid "Overwrite author and title with author and title of selected book"
 msgstr ""
-"Overschrijf de auteur en titel met de auteur en titel van het geselecteerde "
-"boek"
+"Overschrijf auteur en titel met de auteur en titel van het geselecteerde boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:100
 msgid "Download &social metadata (tags/rating/etc.) for the selected book"
@@ -8336,7 +8544,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:42
 msgid "Details of job"
-msgstr "Opdracht details"
+msgstr "Details opdracht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:49
 msgid "Active Jobs"
@@ -8348,27 +8556,27 @@ msgstr "&Stop de geselecteerde opdracht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:51
 msgid "Show job &details"
-msgstr "Laat werk opdracht &details zien"
+msgstr "Laat &details taak zien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:52
 msgid "Stop &all non device jobs"
-msgstr "Stop &alle niet apparaat gerelateerde taken"
+msgstr "Stop &alle niet aan het apparaat gerelateerde taken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:43
 msgid "&Copy to clipboard"
-msgstr ""
+msgstr "&Copieer naar plakbord"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:48
 msgid "Show &details"
-msgstr ""
+msgstr "Toon &details"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:49
 msgid "Hide &details"
-msgstr ""
+msgstr "Verberg &details"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:53
 msgid "Show detailed information about this error"
-msgstr ""
+msgstr "Toon gedetailleerde info over deze fout"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:525
@@ -8381,7 +8589,7 @@ msgstr "Titel/Auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:59
 msgid "Standard metadata"
-msgstr "Standaard metagegevens"
+msgstr "Standaardmetagegevens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:60
 msgid "Custom metadata"
@@ -8397,22 +8605,22 @@ msgid "Working"
 msgstr "Bezig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Kleine letters"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Hoofdletters"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Elk Woord Met Hoofdletter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Maak hoofdletters"
 
@@ -8422,29 +8630,31 @@ msgstr "Karakter match"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:267
 msgid "Regular Expression"
-msgstr "Reguliere Expressie"
+msgstr "Regexp"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:270
 msgid "Replace field"
-msgstr "Vervang veld"
+msgstr "Vervangveld"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:271
 msgid "Prepend to field"
-msgstr "Plaats na veld"
+msgstr "Plaats voor veld"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:272
 msgid "Append to field"
-msgstr "Plaats voor veld"
+msgstr "Plaats na veld"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:282
 msgid "Editing meta information for <b>%d books</b>"
-msgstr "Bewerk van <b>%d boeken</b de meta gegevens"
+msgstr "Bewerk van <b>%d boeken</b de metagegevens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:323
 msgid ""
 "Immediately make all changes without closing the dialog. This operation "
 "cannot be canceled or undone"
 msgstr ""
+"Voer alle veranderingen door zonder de dialoog af te sluiten. Dit kan niet "
+"onderbroken worden of ongedaan gemaakt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:382
 msgid "Book %d:"
@@ -8452,7 +8662,7 @@ msgstr "Boek %d:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:400
 msgid "Enter an identifier type"
-msgstr ""
+msgstr "Geef type identificatie op:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:405
 msgid ""
@@ -8462,9 +8672,9 @@ msgid ""
 "character matching or regular expressions. "
 msgstr ""
 "<b>Je kunt je bibliotheek hiermee vernietigen.</b> Veranderingen zijn "
-"permanent. Je kunt niet ongedaan maken. Je wordt sterk aangeraden om je "
-"Bibliotheek-backup te maken voordat je verder gaat.<p>Zoek en vervang in "
-"tekstvelden met karaktermatching of reguliere expressies. "
+"permanent. Je kunt niet ongedaan maken. Het wordt sterk aangeraden om een "
+"bibliotheekbackup te maken voordat je verder gaat.<p>Zoek en vervang in "
+"tekstvelden met karaktermatching of regexps. "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:413
 msgid ""
@@ -8475,13 +8685,12 @@ msgid ""
 "checked, the search text must match exactly. If it is unchecked, the search "
 "text will match both upper- and lower-case letters"
 msgstr ""
-"In karakter modus wordt gezocht naar de ingevoerde tekst in het opgegeven. "
-"De tekst wordt vervangen door de opgegeven tekst, overal waar het gevonden "
+"In karaktermodus wordt gezocht naar de ingevoerde tekst in het veld. De "
+"tekst wordt vervangen door de opgegeven tekst, overal waar hij gevonden "
 "wordt in het opgegeven veld. Als het vervangen klaar is kan de tekst "
-"aangepast worden naar hoofdletters, kleine letters of elk woord naar "
-"hoofdletter. Als je hoofdletter gevoelig opgeeft dan moet de zoektekst exact "
-"overeenkomen. Als je deze niet kiest dan zal alle tekst, kleine en grote "
-"letters, overeenkomen."
+"aangepast worden naar hoofdletters, kleine letters of met titelconventie. "
+"Als je hoofdlettergevoelig opgeeft dan moet de zoektekst exact overeenkomen. "
+"Als je dit niet kiest danzijn hoofd- en kleine letters gelijkwaardig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:424
 msgid ""
@@ -8497,16 +8706,15 @@ msgid ""
 "information on python's regular expressions, and in particular the 'sub' "
 "function."
 msgstr ""
-"In reguliere expressie modus moet de zoektekst op reguliere expressies van "
-"python zijn gebaseerd. De vervangende teks kan refereren aan parentese "
-"expressies in het patroon. Het zoeken is niet vastgezet en kan verschillende "
-"aanpassingen doen in een keer. De aanpassingsfuncties (kleine letters bv) "
-"worden toegepast op de gevonden tekst, niet op het hele veld. Het "
-"uitkomstveld geeft aan welk veld de aanpassingen gaat krijgen. Je kunt in "
-"dat veld tekst vervangen, of ervoor of erna aan toevoegen. Zie <a "
+"In regexp modusmoet de zoektekst op regexps van python zijn gebaseerd. De "
+"vervangende tekst kan terugrefereren naar uitdrukkingen tussen haakjes in "
+"het patroon. Het zoeken is niet vastgezet en kan verschillende aanpassingen "
+"doen in een keer. De aanpassingsfuncties (kleine letters bv) worden "
+"toegepast op de gevonden tekst, niet op het hele veld. Het uitkomstveld "
+"geeft aan welk veld de aanpassingen gaat krijgen. Je kunt in dat veld tekst "
+"vervangen, of ervoor of erna aan toevoegen. Zie <a "
 "href=\"http://docs.python.org/library/re.html\"> deze bron</a> voor meer "
-"informatie van python's reguliere expressies en dan vooral de 'sub' "
-"(ingebedde) functie."
+"informatie van pythons regexps en dan vooral de 'sub' (ingebedde) functie."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:502
 msgid "S/R TEMPLATE ERROR"
@@ -8518,7 +8726,7 @@ msgstr "Je moet een doel opgeven als de bron een opgemaakt veld is"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:652
 msgid "You must specify a destination identifier type"
-msgstr ""
+msgstr "Je moet een doelidentificatie opgeven"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:759
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:778
@@ -8550,30 +8758,31 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:988
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:587
 msgid "Delete saved search/replace"
-msgstr ""
+msgstr "Verwijder bewaarde Zoek & Vervang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:989
 msgid "The selected saved search/replace will be deleted. Are you sure?"
-msgstr ""
+msgstr "De geselecteerde Zoek & Vervang wordt verwijderd. Ben je zeker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:1006
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:1014
 msgid "Save search/replace"
-msgstr ""
+msgstr "Bewaar Zoek & Vervang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:1007
 msgid "Search/replace name:"
-msgstr ""
+msgstr "Naam voor Zoek & Vervang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:1015
 msgid ""
 "That saved search/replace already exists and will be overwritten. Are you "
 "sure?"
 msgstr ""
+"Deze Zoek & Vervang bestaat al en zal overschreven worden. Ben je zeker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:524
 msgid "Edit Meta information"
-msgstr "Verander Meta informatie"
+msgstr "Verander Meta-informatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:526
 msgid "A&utomatically set author sort"
@@ -8585,7 +8794,7 @@ msgstr "Verwi&ssel titel en auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:528
 msgid "Author s&ort: "
-msgstr "Auteur s&ortering: "
+msgstr "Auteur-s&ortering: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:529
 msgid ""
@@ -8620,7 +8829,7 @@ msgstr " sterren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:536
 msgid "Add ta&gs: "
-msgstr "Voeg tags toe: "
+msgstr "Voeg labels toe: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:538
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:539
@@ -8628,20 +8837,20 @@ msgstr "Voeg tags toe: "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:432
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:143
 msgid "Open Tag Editor"
-msgstr "Open Tag Editor"
+msgstr "Open Labeleditor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:540
 msgid "&Remove tags:"
-msgstr "&Verwijder tags:"
+msgstr "&Verwijder labels:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:541
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
-"Lijst van tags die moeten worden verwijderd, gescheiden met komma's. "
+"Lijst van labels die moeten worden verwijderd, gescheiden met komma's. "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:542
 msgid "Check this box to remove all tags from the books."
-msgstr "Aanvinken om alle tags uit de boeken te verwijderen"
+msgstr "Aanvinken om alle labels van de boeken te verwijderen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:543
 msgid "Remove &all"
@@ -8649,11 +8858,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:547
 msgid "If checked, the series will be cleared"
-msgstr "Aangevinkt, de serie wordt verwijderd"
+msgstr "Aangevinkt, de reeks wordt verwijderd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:548
 msgid "&Clear series"
-msgstr ""
+msgstr "&Maak reeks leeg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:549
 msgid ""
@@ -8662,13 +8871,13 @@ msgid ""
 "you selected them. 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 ""
-"Als deze niet aangevinkt is dan zullen alle nummers van de serie op 1 gezet\n"
-"worden. Als deze wel aangevinkt is dan zullen de boeken automatisch\n"
+"Als dit niet aangevinkt is dan zullen alle nummers van de reeks op 1 gezet\n"
+"worden. Als dit wel aangevinkt is dan zullen de boeken automatisch\n"
 "worden genummerd in de volgorde van de selectie."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:553
 msgid "&Automatically number books in this series"
-msgstr ""
+msgstr "Nummer boeken in deze reeks &automatisch"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:554
 msgid ""
@@ -8676,13 +8885,13 @@ msgid ""
 "for that series. Checking this box will tell calibre to start numbering\n"
 "from the value in the box"
 msgstr ""
-"Series worden standaard genummerd vanaf het hoogste nummer van deze serie \n"
+"Reeksen worden standaard genummerd vanaf het hoogste nummer van deze reeks \n"
 "in de database. Vink dit aan om Calibre te laten nummeren vanaf de \n"
 "opgegeven waarde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:557
 msgid "&Force numbers to start with:"
-msgstr ""
+msgstr "&Forceer begin start nummering met:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:558
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:440
@@ -8692,21 +8901,21 @@ msgstr "&Datum:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:559
 msgid "d MMM yyyy"
-msgstr ""
+msgstr "d MMM jjjj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:561
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:566
 msgid "&Apply date"
-msgstr ""
+msgstr "P&as datum toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:562
 msgid "&Published:"
-msgstr ""
+msgstr "Ge&publiceerd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:564
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:444
 msgid "Clear published date"
-msgstr ""
+msgstr "Verwijder datum publicatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:567
 msgid "Remove &format:"
@@ -8718,24 +8927,25 @@ msgid ""
 "checked,\n"
 "title and author are swapped before the title case is set"
 msgstr ""
-"Maakt van de woorden in de titel de eerste letter een hoofdletter. Als deze "
-"en wissel\n"
-"titel en auteur samen aangevinkt zijn is eerst de wissel en daarna de "
-"hoofdletters"
+"Maakt van de woorden in de titel de eerste letter een hoofdletter. Als dit "
+"en\n"
+"'wissel titel en auteur' samen aangevinkt zijn wordt eerst gewisseld"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:570
 msgid "Change title to title &case"
-msgstr ""
+msgstr "Verander hoofdletters in titel naar titelformaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:571
 msgid ""
 "Update title sort based on the current title. This will be applied only "
 "after other changes to title."
 msgstr ""
+"Pas sortering per titel aan de huidige titel aan. Wordt pas uitgevoerd na "
+"andere aanpassingen op titel."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:572
 msgid "Update &title sort"
-msgstr ""
+msgstr "Pas titelsortering aan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:573
 msgid ""
@@ -8743,38 +8953,38 @@ msgid ""
 "\n"
 "Future conversion of these books will use the default settings."
 msgstr ""
-"Verwijder voor de geselecteerde boeken de conversie instellingen.\n"
+"Verwijder de conversie-instellingen voor de geselecteerde boeken.\n"
 "\n"
-"Toekomstige conversies van deze boeken zullen de standaard instellingen "
+"Toekomstige conversies van deze boeken zullen de standaardinstellingen "
 "gebruiken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:576
 msgid "Remove &stored conversion settings for the selected books"
 msgstr ""
-"Verwijder voor de geselecteerde boeken de opge&slagen conversie instellingen."
+"Verwijder de opge&slagen conversie-instellingen voor de geselecteerde boeken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:577
 msgid "Change &cover"
-msgstr ""
+msgstr "Verander &omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:578
 msgid "&Generate default cover"
-msgstr ""
+msgstr "Maak &standaardomslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:579
 msgid "&Remove cover"
-msgstr ""
+msgstr "&Verwijder omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:580
 msgid "Set from &ebook file(s)"
-msgstr ""
+msgstr "Neem uit e-boekbestanden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:581
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:465
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:397
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:526
 msgid "&Basic metadata"
-msgstr "&Basis metagegevens"
+msgstr "&Basismetagegevens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:582
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:466
@@ -8784,19 +8994,19 @@ msgstr "&Aangepaste metagegevens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:583
 msgid "Load searc&h/replace:"
-msgstr ""
+msgstr "Laad Zoek & Vervang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:584
 msgid "Select saved search/replace to load."
-msgstr ""
+msgstr "Selecteer Zoek & Vervang om te laden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:585
 msgid "Save current search/replace"
-msgstr ""
+msgstr "Bewaar Zoek & Vervang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:586
 msgid "Sa&ve"
-msgstr ""
+msgstr "Be&waar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:588
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:64
@@ -8813,33 +9023,32 @@ msgstr "De naam van het veld dat je wilt zoeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:591
 msgid "Search &mode:"
-msgstr ""
+msgstr "Zoek&modus:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:592
 msgid ""
 "Choose whether to use basic text matching or advanced regular expression "
 "matching"
 msgstr ""
-"Kies voor normale tekst vergelijking of geavanceerde reguliere expressie "
-"vergelijking"
+"Kies voor normale tekstvergelijking of geavanceerde regexpvergelijking"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:593
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:615
 msgid "Identifier type:"
-msgstr ""
+msgstr "Type identificator"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:594
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:616
 msgid "Choose which identifier type to operate upon"
-msgstr ""
+msgstr "Kies welke identificator gebruikt wordt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:595
 msgid "Te&mplate:"
-msgstr ""
+msgstr "&Patroon:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:596
 msgid "Enter a template to be used as the source for the search/replace"
-msgstr ""
+msgstr "Geef een zoekpatroon voor Zoek & Vervang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:597
 msgid "&Search for:"
@@ -8850,8 +9059,8 @@ msgid ""
 "Enter the what you are looking for, either plain text or a regular "
 "expression, depending on the mode"
 msgstr ""
-"Geef op wat je wilt zoeken, gewoon tekst of een reguliere expressie, "
-"afhankelijk van de modus."
+"Geef op wat je wil zoeken, gewone tekst of een regexp, afhankelijk van de "
+"modus."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:599
 msgid ""
@@ -8863,7 +9072,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:600
 msgid "Cas&e sensitive"
-msgstr ""
+msgstr "Hoofd/kleinelettergevoelig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:601
 msgid "&Replace with:"
@@ -8879,7 +9088,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:603
 msgid "&Apply function after replace:"
-msgstr ""
+msgstr "functie toe te p&assen na vervangen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:604
 msgid ""
@@ -8888,9 +9097,9 @@ msgid ""
 "field is processed. In regular expression mode, only the matched text is "
 "processed"
 msgstr ""
-"Geef op hoe de tekst verwerkt moet worden na samenvoeging en vervanging. In "
+"Geef op hoe de tekst verwerkt moet worden na zoeken en vervangen. In "
 "karaktermodus wordt het volledige\n"
-"veld verwerkt. In expressiemodus wordt alleen de geraakte tekst verwerkt."
+"veld verwerkt. In uitdrukkingmodus wordt alleen de gevonden tekst verwerkt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:606
 msgid "&Destination field:"
@@ -8901,6 +9110,8 @@ msgid ""
 "The field that the text will be put into after all replacements.\n"
 "If blank, the source field is used if the field is modifiable"
 msgstr ""
+"Het veld waar de tekst naartoe gaat na alle vervangingen.\n"
+"Als dit leeg is wordt het bronveld gebruikt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:609
 msgid "M&ode:"
@@ -8917,36 +9128,39 @@ msgid ""
 "is\n"
 "not multiple and the destination field is multiple"
 msgstr ""
+"Specificeert of het resultaat moet opgesplitst in meerdere waarden of\n"
+"als een waarde moet behouden blijven. Heeft het meeste effect als het\n"
+"bronveld niet meervoudig is en het doelveld wel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:614
 msgid "Split &result"
-msgstr ""
+msgstr "Splits &resultaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:617
 msgid "For multiple-valued fields, sho&w"
-msgstr ""
+msgstr "Toon voor meervo&udige velden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:618
 msgid "values starting a&t"
-msgstr ""
+msgstr "Waarden beginnend me&t"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:619
 msgid "with values separated b&y"
-msgstr ""
+msgstr "met waarden gesche&iden door"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:620
 msgid ""
 "Used when displaying test results to separate values in multiple-valued "
 "fields"
-msgstr ""
+msgstr "Gebruikt om testresultaten te tonen in meervoudige velden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:621
 msgid "Test text"
-msgstr ""
+msgstr "Testtekst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:622
 msgid "Test result"
-msgstr ""
+msgstr "Testresultaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:623
 msgid "Your test:"
@@ -8954,34 +9168,34 @@ msgstr "Jouw test:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:624
 msgid "&Search and replace"
-msgstr "Zoek tek&st en vervang"
+msgstr "&Zoek & Vervang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:429
 msgid "Last modified: %s"
-msgstr "Het laatst aangepast: %s"
+msgstr "Laatst aangepast op: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:255
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:262
 msgid "Could not read cover"
-msgstr "Omslag afbeelding kan niet worden gelezen"
+msgstr "Omslagafbeelding kan niet worden gelezen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:256
 msgid "Could not read cover from %s format"
-msgstr "Kan omslag afbeelding van %s formaat niet lezen"
+msgstr "Kan omslagafbeelding van %s-formaat niet lezen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:263
 msgid "The cover in the %s format is invalid"
-msgstr "De omslag afbeelding in het %s formaat is ongelding"
+msgstr "De omslagafbeelding in het %s-formaat is ongeldig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:746
 msgid "Cover size: %dx%d pixels"
-msgstr "Omslaggrootte: %dx%d pixels"
+msgstr "Grootte omslag: %dx%d pixels"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:670
@@ -8997,11 +9211,11 @@ msgstr "Geef titel en auteur"
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:698
 msgid "You must specify a title and author before generating a cover"
 msgstr ""
-"U moet een titel en auteur specificeren voordat u en omslag genereert."
+"Je moet een titel en auteur specificeren voordat je een omslag genereert."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:246
 msgid "Downloading cover..."
-msgstr "Downloaden omslag afbeelding..."
+msgstr "Downloaden omslag..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:267
@@ -9023,7 +9237,7 @@ msgstr "De download is verbroken"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:268
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr ""
-"Kan geen omslag afbeelding voor dit book vinden. Probeer eerst het ISBN "
+"Kan geen omslagafbeelding voor dit boek vinden. Probeer eerst het ISBN-"
 "nummer op te geven."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:280
@@ -9034,11 +9248,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:287
 msgid "Bad cover"
-msgstr "Ongeldige omslag afbeelding"
+msgstr "Ongeldige omslagafbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:288
 msgid "The cover is not a valid picture"
-msgstr "De omslag afbeelding is geen geldige afbeelding"
+msgstr "De omslag is geen geldige afbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:527
@@ -9070,7 +9284,7 @@ msgstr "Metagegevens kunnen niet worden gelezen"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:379
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:604
 msgid "Could not read metadata from %s format"
-msgstr "Kan metagegevens van %s formaat niet lezen"
+msgstr "Kan metagegevens van %s-formaat niet lezen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:229
@@ -9078,7 +9292,7 @@ msgid ""
 " The green color indicates that the current author sort matches the current "
 "author"
 msgstr ""
-" De groene kleur geeft aan dat de huidige auteursortering overeenkomt met de "
+" De groene kleur geeft aan dat de huidige sorteerauteur overeenkomt met de "
 "huidige auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:456
@@ -9087,6 +9301,8 @@ msgid ""
 " The red color indicates that the current author sort does not match the "
 "current author. No action is required if this is what you want."
 msgstr ""
+" De rode kleur geeft aan dat de huidige sorteerauteur niet overeenkomt met "
+"de huidige auteur. Als dit is wat je wil kan je het zo laten."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:463
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:119
@@ -9094,6 +9310,8 @@ msgid ""
 " The green color indicates that the current title sort matches the current "
 "title"
 msgstr ""
+" De groene kleur geeft aan dat de huidige sorteertitel overeenkomt met de "
+"huidige titel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:466
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:122
@@ -9101,6 +9319,8 @@ msgid ""
 " The red color warns that the current title sort does not match the current "
 "title. No action is required if this is what you want."
 msgstr ""
+" De rode kleur geeft aan dat de huidige sorteertitel niet overeenkomt met de "
+"huidige titel. Als dit is wat je wil kan je het zo laten."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:472
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:50
@@ -9115,7 +9335,7 @@ msgstr "Vorige"
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:361
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:366
 msgid "Save changes and edit the metadata of %s"
-msgstr "Opslaan veranderingen en pas de metagegevens aan van %s"
+msgstr "Sla veranderingen op en pas de metagegevens aan van %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:481
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:46
@@ -9129,17 +9349,17 @@ msgstr "Volgende"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:695
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:913
 msgid "This ISBN number is valid"
-msgstr "Dit ISBN nummer is geldig"
+msgstr "Dit ISBN-nummer is geldig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:698
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:920
 msgid "This ISBN number is invalid"
-msgstr "Dit ISBN nummer is ongeldig"
+msgstr "Dit ISBN-nummer is ongeldig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:783
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:862
 msgid "Tags changed"
-msgstr "Tags veranderd"
+msgstr "Labels veranderd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:784
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:863
@@ -9147,16 +9367,20 @@ msgid ""
 "You have changed the tags. In order to use the tags editor, you must either "
 "discard or apply these changes. Apply changes?"
 msgstr ""
+"Je hebt de labels veranderd. Om de labeleditor te gebruiken moet je deze "
+"veranderingen toepassen of verwerpen. Veranderingen toepassen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:819
 msgid "Timed out"
-msgstr ""
+msgstr "time-out"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:820
 msgid ""
 "The download of social metadata timed out, the servers are probably busy. "
 "Try again later."
 msgstr ""
+"Time-out bij het downloaden van sociale metagegevens; de servers zijn "
+"waarschijnlijk overbelast. Probeer later nog eens."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:827
 msgid "There were errors"
@@ -9187,15 +9411,15 @@ msgstr "Geen toegang"
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:311
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
-"%s van niet worden geopend. Is het in gebruik door een ander programma?"
+"%s kan niet worden geopend. Is het in gebruik door een ander programma?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406
 msgid "Edit Meta Information"
-msgstr "Verander Meta Informatie"
+msgstr "Verander Meta-informatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407
 msgid "Meta information"
-msgstr "Meta informatie"
+msgstr "Meta-informatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:92
@@ -9204,11 +9428,13 @@ msgid ""
 "Using this button to create title sort will change title sort from red to "
 "green."
 msgstr ""
+"Leid de sorteertitel automatisch af uit de titel. Gebruik van deze knop\n"
+"om de sorteertitel te maken zal de sorteertitel veranderen van roodin groen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:114
 msgid "Swap the author and title"
-msgstr "Wissel auteur en titel van plaats"
+msgstr "Verwissel auteur en titel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:415
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:103
@@ -9218,12 +9444,13 @@ msgid ""
 "Using this button to create author sort will change author sort from red to "
 "green."
 msgstr ""
-"Baseer automatisch de auteursortering op de geselecteerde auteur.\n"
-"Gebruik deze knop om de auteursortering van rood naar groen te veranderen."
+"Leid de sorteerauteur automatisch af uit de auteur. Gebruik van deze knop\n"
+"om de sorteerauteur te maken zal de sorteerauteur veranderen van roodin "
+"groen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:418
 msgid "Title &sort: "
-msgstr ""
+msgstr "Sorteertitel: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:419
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:109
@@ -9231,10 +9458,12 @@ msgid ""
 "Specify how this book should be sorted when by title. For example, The "
 "Exorcist might be sorted as Exorcist, The."
 msgstr ""
+"Geef aan wat de titel is die moet gebruikt worden bij sorteren. Zo kan "
+"bijvoorbeeld 'De Avonden' gesorteerd worden als 'Avonden, de'."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:421
 msgid "Author S&ort: "
-msgstr "Auteur S&ortering: "
+msgstr "S&orteerauteur: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:422
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:215
@@ -9247,13 +9476,13 @@ msgstr ""
 "Geef aan hoe de auteurs van dit boek gesorteerd moeten worden. Bijvoorbeeld "
 "Charles Dickens moet gesorteerd worden als Dickens, Charles.\n"
 "Als het veld groen gekleurd is, dan komt de tekst overeen met de individuele "
-"auteur sortering.  Als het rood is, dan komen de auteurs en tekst niet "
+"sorteerauteur. Als het rood is, dan komen de auteurs en deze tekst niet "
 "overeen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:436
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:121
 msgid "Remove unused series (Series that have no books)"
-msgstr "Verwijder ongebruikte series (Series die geen boeken bevatten)"
+msgstr "Verwijder ongebruikte reeksen (Reeksen die geen boeken bevatten)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:439
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:886
@@ -9281,7 +9510,7 @@ msgstr "&Bladeren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:449
 msgid "Remove border (if any) from cover"
-msgstr "Verwijder rand (als er is) van omslag"
+msgstr "Verwijder rand (als die er is) van omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:623
@@ -9290,12 +9519,12 @@ msgstr "T&rimmen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:451
 msgid "Reset cover to default"
-msgstr "Vervang omslag afbeelding door de standaard afbeelding"
+msgstr "Vervang omslagafbeelding door de standaardafbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:625
 msgid "&Remove"
-msgstr ""
+msgstr "Ve&rwijder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:453
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:631
@@ -9304,7 +9533,7 @@ msgstr "Download omslag &v"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:454
 msgid "Generate a default cover based on the title and author"
-msgstr "Genereer een standaard omslag aan de hand van de titel en auteur"
+msgstr "Genereer een standaardomslag aan de hand van de titel en auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:632
@@ -9321,18 +9550,18 @@ msgstr "Voeg een nieuw formaat voor dit boek toe aan de database"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:459
 msgid "Remove the selected formats for this book from the database."
-msgstr "Verwijder de geselecteerde formaten voor dit boek van de database."
+msgstr "Verwijder de geselecteerde formaten voor dit boek uit de database."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:461
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:446
 msgid "Set the cover for the book from the selected format"
-msgstr "Zet de omslag afbeelding van het book van het geselecteerde formaat"
+msgstr "Zet de omslagafbeelding van het boek van het geselecteerde formaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:463
 msgid "Update metadata from the metadata in the selected format"
 msgstr ""
-"Update metagegevens van de metagegevens die in het geselecteerde formaat "
-"staan"
+"Update metagegevens a.d.h.v. de metagegevens die in het geselecteerde "
+"formaat staan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:464
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:585
@@ -9362,7 +9591,7 @@ msgstr "W&achtwoord:"
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:173
 msgid "&Show password"
-msgstr "&Geef wachtwoord weer"
+msgstr "&Toon wachtwoord"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:59
 msgid "Aborting..."
@@ -9373,6 +9602,8 @@ msgid ""
 "Restoring database from backups, do not interrupt, this will happen in three "
 "stages"
 msgstr ""
+"Databank wordt hersteld uit back-ups, niet onderbreken. Dit gebeurt in drie "
+"fasen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:25
 msgid "Restoring database"
@@ -9388,30 +9619,43 @@ msgid ""
 "only restores books, not any settings stored in the database, or any custom "
 "recipes.<p>Do you want to restore the database?"
 msgstr ""
+"Je boekenlijst met alle metagegevens is opgeslagen in ëën bestand, databank "
+"genoemd. Metagegevens voor een boek zijn ook opgeslagen in de folder van dat "
+"boek als back-up.<p> Deze actie zel de databank opnieuw opbouwen van die "
+"individuale back-ups. Dit is nuttig als je een blanco boekenlijst krijgt "
+"omdat er iets mis is met de databank. Herstellen herstelt aleen de metadata, "
+"maar geen instellingen of recepten die waren opgeslagen.<p> Wil je de "
+"databank herstellen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:102
 msgid "Restoring database failed, click Show details to see details"
 msgstr ""
+"Herstellen van de databank is mislukt. Klik op `Toon details' om details te "
+"zien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:107
 msgid ""
 "Restoring the database succeeded with some warnings click Show details to "
 "see the details."
 msgstr ""
+"Herstellen van de databank is gelukt maar er zijn waarschuwingen.  Klik op "
+"`Toon details' om details te zien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:112
 msgid "Restoring database was successful"
-msgstr ""
+msgstr "Herstellen van de databank is gelukt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:75
 msgid "Saved search already exists"
-msgstr ""
+msgstr "Op te slagen zoekopdracht bestond al"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:76
 msgid "The saved search %s already exists, perhaps with different case"
 msgstr ""
+"Op te slagen zoekopdracht %s bestaat al, misschien met andere hoofd-/kleine "
+"letterinstelling."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:62
 msgid ""
@@ -9422,11 +9666,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:94
 msgid "Saved Search Editor"
-msgstr "Opgeslagen Zoekopdrachten Editor"
+msgstr "Editor opgeslagen zoekopdrachten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:95
 msgid "Saved Search: "
-msgstr "Opgeslagen Zoekopdracht: "
+msgstr "Opgeslagen zoekopdracht: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:96
 msgid "Select a saved search to edit"
@@ -9438,7 +9682,7 @@ msgstr "Verwijder deze geselecteerde opgeslagen zoekopdracht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:99
 msgid "Enter a new saved search name."
-msgstr "Geef een nieuwe opgeslagen zoekopdracht naam."
+msgstr "Geef een nieuwe naam opgeslagen zoekopdracht."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:100
 msgid "Add the new saved search"
@@ -9446,7 +9690,7 @@ msgstr "Voeg de nieuwe opgeslagen zoekopdracht toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:102
 msgid "Rename the current search to what is in the box"
-msgstr ""
+msgstr "Geef andere naam aan wat in het vak staat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:104
 msgid "Change the contents of the saved search"
@@ -9463,6 +9707,11 @@ msgid ""
 "                soon after 9:00 AM as possible.\n"
 "            "
 msgstr ""
+"                Download deze periodiek elke week op de aangegeven dag na\n"
+"                de aangegeven tijd. Als je bv. maandag na 13u00 kiest wordt\n"
+"                de periodiek gedownload zo snel mogelijk na13u00 van elke "
+"maandag.\n"
+"            "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:61
 msgid "&Download after:"
@@ -9480,18 +9729,26 @@ msgid ""
 "                month, as soon after 9:00 AM as possible.\n"
 "            "
 msgstr ""
+"                Download deze periodiek elke maand op de aangegeven dagen "
+"na\n"
+"                de aangegeven tijd. Als je bv. de 1e en de 15e na 13u00 "
+"kiest wordt\n"
+"                de periodiek gedownload zo snel mogelijk na 13u00 van elke "
+"1e en\n"
+"                 15e van de maand.\n"
+"            "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:103
 msgid "&Days of the month:"
-msgstr ""
+msgstr "&Dagen van de maand:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:105
 msgid "Comma separated list of days of the month. For example: 1, 15"
-msgstr ""
+msgstr "Door komma's gescheiden lijst van dagen, bv.: 1, 15"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:109
 msgid "Download &after:"
-msgstr ""
+msgstr "Download n&a:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:142
 msgid ""
@@ -9502,27 +9759,35 @@ msgid ""
 "                0.1 days to download a periodical more than once a day.\n"
 "            "
 msgstr ""
+"                Download deze periodiek elke x dagen. Als je bv. 30 dagen\n"
+"                kiest wordt hij om de dertig dagen gedownload. Merk op dat\n"
+"                je periodes van minder dan 1 dag kan kiezen, zoals 0.1 dag "
+"om\n"
+"                het tijdschrift meer dan een keer per dag to downloaden.\n"
+"            "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:151
 msgid "&Download every:"
-msgstr ""
+msgstr "&Download elke:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:154
 msgid "every hour"
-msgstr ""
+msgstr "elk uur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:157
 msgid "days"
-msgstr ""
+msgstr "dagen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:161
 msgid ""
 "Note: You can set intervals of less than a day, by typing the value manually."
 msgstr ""
+"Let op: om een periode kleiner dan een dag te kiezen moet je ze manueel "
+"intikken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:196
 msgid "%s news sources"
-msgstr ""
+msgstr "Niuewsbronnen %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Need username and password"
@@ -9556,7 +9821,7 @@ msgstr "Laatst gedownload: nooit"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:373
 msgid "never"
-msgstr ""
+msgstr "nooit"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:379
 msgid "%d days, %d hours and %d minutes ago"
@@ -9564,7 +9829,7 @@ msgstr "%d dagen, %d uur en %d minuten geleden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:393
 msgid "Last downloaded:"
-msgstr ""
+msgstr "Laatste download"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:421
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
@@ -9606,11 +9871,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202
 msgid "Days of month"
-msgstr ""
+msgstr "Dagen van de maand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203
 msgid "Every x days"
-msgstr ""
+msgstr "Elke x dagen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204
 msgid "&Account"
@@ -9628,21 +9893,22 @@ msgstr "&Planning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:210
 msgid "Add &title as tag"
-msgstr "Voeg &titel toe als tag"
+msgstr "Voeg &titel toe als label"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Extra  tags:"
-msgstr "&Extra tags:"
+msgstr "&Extra labels:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 msgid ""
 "Maximum number of copies (issues) of this recipe to keep.  Set to 0 to keep "
 "all (disable)."
 msgstr ""
+"Maximaal aantal nummers om te behouden. Stel 0 in om alle te behouden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 msgid "&Keep at most:"
-msgstr ""
+msgstr "&Houd hoogstens:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid ""
@@ -9654,14 +9920,20 @@ msgid ""
 "<p>Also, the setting for deleting periodicals older than a number of days, "
 "below, takes priority over this setting."
 msgstr ""
+"<p>Als dit ingevuld wordt zal calibre hoogstens dit aantal nummers van het "
+"tijdschrift bewaren. Als dit aantal bereikt is zal calibre de oudste editie "
+"verwijderen.<p>Merk op dat deze functie alleen werkt als je hierboven de "
+"optie 'Voeg titel toe als label' hebt aangevinkt.\n"
+"<p>De instelling om tijdschriftnummers te verwijderen als ze ouder zijn dan "
+"een gegeven aantal dagen hieronder heeft voorrang boven deze instelling."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "all issues"
-msgstr ""
+msgstr "alle nummers"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid " issues"
-msgstr ""
+msgstr " nummers"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
@@ -9673,7 +9945,7 @@ msgstr "&Download nu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:221
 msgid "&Delete downloaded news older than:"
-msgstr ""
+msgstr "&Verwijder nieuws dat ouder is dan:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:222
 msgid ""
@@ -9683,10 +9955,15 @@ msgid ""
 "periodical that are kept by clicking the Advanced tab for that periodical "
 "above."
 msgstr ""
+"<p>Verwijder nieuws dat meer dan het aantal aangegeven dagen geleden werd "
+"gedownload. Zet op nul om dit uit te schakelen.\n"
+"<p>Je kan ook het maximale aantal nummers om te bewaren van een specifiek "
+"tijdschrift instellen door op de 'geavanceerd'-tab hierboven voor dat "
+"tijdschrift te klikken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:224
 msgid "never delete"
-msgstr ""
+msgstr "Nooit verwijderen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:225
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
@@ -9695,11 +9972,11 @@ msgstr " dagen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:226
 msgid "Download all scheduled news sources at once"
-msgstr ""
+msgstr "Download alle  ingestelde nieuwsbronnen onmiddellijk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:227
 msgid "Download &all scheduled"
-msgstr "Download &alle gepland"
+msgstr "Download &alle geplande"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:41
 msgid "contains"
@@ -9709,7 +9986,7 @@ msgstr "bevat"
 msgid "The text to search for. It is interpreted as a regular expression."
 msgstr ""
 "De tekst om naar te zoeken. Deze wordt geïnterpreteerd als reguliere "
-"expressie."
+"uitdrukking."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:43
 msgid ""
@@ -9729,24 +10006,22 @@ msgstr "Geavanceerde zoekopdracht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:199
 msgid "&What kind of match to use:"
-msgstr ""
+msgstr "Soort zoeken om te gebr&Uiken:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:200
 msgid "Contains: the word or phrase matches anywhere in the metadata field"
 msgstr ""
-"Bevat: Het woord of de zin kan overal in het metagegevensveld matchen"
+"Bevat: Het woord of de zin mag overal in het metagegevensveld voorkomen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:201
 msgid "Equals: the word or phrase must match the entire metadata field"
 msgstr ""
-"Gelijke: Het woord of de zin moet matchen met het hele metagegevensveld."
+"Gelijk: Het woord of de zin moet gelijk zijn met het hele metagegevensveld."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:202
 msgid ""
 "Regular expression: the expression must match anywhere in the metadata field"
-msgstr ""
-"Reguliere expressie: de expressie moet overal in het metagegevensveld "
-"matchen."
+msgstr "Regexp: de uitdrukking mag overal in het metagegevensveld voorkomen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:203
 msgid "Find entries that have..."
@@ -9754,15 +10029,15 @@ msgstr "Zoek inzendingen die..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:204
 msgid "&All these words:"
-msgstr "&al deze woorden:"
+msgstr "&Al deze woorden:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:205
 msgid "This exact &phrase:"
-msgstr "Deze exacte &uitdrukking:"
+msgstr "&Exact deze &uitdrukking:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:206
 msgid "&One or more of these words:"
-msgstr "&Een of meer vam deze woorden:"
+msgstr "Een of &meer vam deze woorden:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:207
 msgid "But dont show entries that have..."
@@ -9770,7 +10045,7 @@ msgstr "Maar laat geen inzendingen zien die..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:208
 msgid "Any of these &unwanted words:"
-msgstr "Deze &ongewenste woorden bevat:"
+msgstr "&ook maar een van deze &Ongewenste woorden bevat:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:209
 msgid ""
@@ -9778,7 +10053,7 @@ msgid ""
 "interface\">User Manual</a> for more help"
 msgstr ""
 "Zie het  <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-"
-"interface\">Gebruikers Handboek</a> voor meer informatie"
+"interface\">Gebruikershandboek</a> voor meer informatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:210
 msgid "A&dvanced Search"
@@ -9795,21 +10070,21 @@ msgstr "&Auteur:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:215
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:827
 msgid "Ta&gs:"
-msgstr "Ta&gs:"
+msgstr "la&Bels:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:216
 msgid "Enter an author's name. Only one author can be used."
-msgstr "Geef een auteursnaam op. Er kan 1 auteur gebruikt worden."
+msgstr "Geef een auteursnaam op. Er kan maar 1 auteur gebruikt worden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:217
 msgid ""
 "Enter a series name, without an index. Only one series name can be used."
 msgstr ""
-"Geef een serienaam op, zonder index. Er kan 1 serienaam gebruikt worden."
+"Geef een reeksnaam op, zonder index. Er kan maar 1 reeksnaam gebruikt worden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:218
 msgid "Enter tags separated by spaces"
-msgstr "Geef de tags op gescheiden met spaties"
+msgstr "Geef de labels op, gescheiden met spaties"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:101
@@ -9818,11 +10093,11 @@ msgstr "&Wis"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:220
 msgid "Search only in specific fields:"
-msgstr "Zoek in specifieke velden:"
+msgstr "Zoek enkel in specifieke velden:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:221
 msgid "Titl&e/Author/Series ..."
-msgstr "Tite&l/Auteur/Series ..."
+msgstr "Tite&l/Auteur/Reeks ..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
@@ -9844,12 +10119,12 @@ msgstr " (in geen enkel boek)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:146
 msgid "Category lookup name: "
-msgstr ""
+msgstr "Zoeknaam voor categorie: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:191
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:222
 msgid "Invalid name"
-msgstr ""
+msgstr "Ongeldige naam"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:192
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:223
@@ -9857,28 +10132,30 @@ msgid ""
 "That name contains leading or trailing periods, multiple periods in a row or "
 "spaces before or after periods."
 msgstr ""
+"De naam bevat punten voor- of achteraan, verschillende punten na elkaar "
+"ofspaces before or after periods."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:200
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:230
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:151
 msgid "Name already used"
-msgstr ""
+msgstr "Naam is al gebruikt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:201
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:231
 msgid "That name is already used, perhaps with different case."
-msgstr ""
+msgstr "De naam wordt al gebruikt, misschien met andere hoofd/kleine letters"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:244
 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??"
+"De huidige labelcategorie zal <b>definitief verwijderd worden</b>. Ben je "
+"zeker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:166
 msgid "User Categories Editor"
-msgstr "Gebruikerscategorieën opmaakprogramma"
+msgstr "Editor Gebruikerscategorieën"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
 msgid "Category name: "
@@ -9890,19 +10167,20 @@ msgstr "Selecteer een categorie om te wijzigen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:169
 msgid "Delete this selected tag category"
-msgstr "Verwijder de geselecteerde labelcategory"
+msgstr "Verwijder de geselecteerde labelcategorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:171
 msgid "Enter a category name, then use the add button or the rename button"
 msgstr ""
+"Voer de categorienaam in en gebruik dan de 'Voeg toe'- of de 'Hernoem'-knop"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:172
 msgid "Add a new category"
-msgstr ""
+msgstr "Voeg nieuwe categorie toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:174
 msgid "Rename the current category to the what is in the box"
-msgstr ""
+msgstr "Hernoem de huidige categorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:176
 msgid "Category filter: "
@@ -9910,7 +10188,7 @@ msgstr "Categoriefilter: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:177
 msgid "Select the content kind of the new category"
-msgstr "Selecteer het type inhoud voor de nieuwe categorie"
+msgstr "Selecteer het inhoudstype voor de nieuwe categorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:178
 msgid "A&vailable items"
@@ -9931,19 +10209,19 @@ msgstr "Verwijder het label van de huidige labelcategorie"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:111
 msgid "Are your sure?"
-msgstr "Weet U het zeker?"
+msgstr "Ben je zeker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:71
 msgid ""
 "The following tags are used by one or more books. Are you certain you want "
 "to delete them?"
 msgstr ""
-"De volgende tags zijn in gebruik door een of meerdere boeken. Weet je zeker "
-"dat je ze wilt verwijderen?"
+"De volgende lebels zijn in gebruik door een of meerdere boeken. Weet je "
+"zeker dat je ze wilt verwijderen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
 msgid "Tag Editor"
-msgstr "Tag-bewerker"
+msgstr "Labeleditor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&vailable tags"
@@ -9954,12 +10232,12 @@ msgid ""
 "Delete tag from database. This will unapply the tag from all books and then "
 "remove it from the database."
 msgstr ""
-"Verwijder tag uit database. Dit verwijderd de tag van alle boeken, en daarna "
-"uit de database."
+"Verwijder label uit database. Dit verwijdert het label van alle boeken, en "
+"daarna uit de database."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "Apply tag to current book"
-msgstr "Pas tag toe aan het huidige boek"
+msgstr "Plak label op  het huidige boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134
 msgid "A&pplied tags"
@@ -9967,19 +10245,20 @@ msgstr "Toege&paste labels"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
 msgid "Unapply (remove) tag from current book"
-msgstr "Verwijder tag uit het huidige boek"
+msgstr "Verwijder label uit het huidige boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:137
 msgid "&Add tag:"
-msgstr "Voeg tag &toe:"
+msgstr "Voeg label &toe:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:138
 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 ""
-"Als het label die u wilt gebruiken niet in de beschikbare lijst voorkomt, "
-"dan kun u hem hier toevoegen als lijst gescheiden met komma's."
+"Als het label dat je wil gebruiken niet in de beschikbare lijst voorkomt, "
+"dan kan je het hier toevoegen. Je kan een lijst gescheiden met komma's "
+"opgeven."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:139
 msgid "Add tag to available tags and apply it to current book"
@@ -9991,14 +10270,14 @@ msgid "%s (was %s)"
 msgstr "%s (was %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Veld is leeg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
-msgstr "Een veld kan niet leeg zijn. U dient het te verwijderen."
+msgstr "Een veld mag niet leeg zijn. Je moet het verwijderen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:99
 msgid "No item selected"
@@ -10007,7 +10286,7 @@ msgstr "Geen item geselecteerd"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:100
 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."
+"Je moet één van de items te selecteren uit de lijst van beschikbare items."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:107
 msgid "No items selected"
@@ -10019,7 +10298,7 @@ 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:112
 msgid "Are you certain you want to delete the following items?"
-msgstr "Bent je zeker dat je deze items wilt verwijderen?"
+msgstr "Ben je zeker dat je deze items wilt verwijderen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
 msgid "Category Editor"
@@ -10048,27 +10327,27 @@ msgstr "Ctrl+S"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog_ui.py:71
 msgid "Function &name:"
-msgstr ""
+msgstr "functie&Naam"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:100
 msgid "&Documentation:"
-msgstr ""
+msgstr "&Documentatie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog_ui.py:73
 msgid "Python &code:"
-msgstr ""
+msgstr "Python&code:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:56
 msgid "Test email settings"
-msgstr "Test email instellingen"
+msgstr "Test e-mailinstellingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:57
 msgid "Send test mail from %s to:"
-msgstr "Verstuur test email van %s naar:"
+msgstr "Verstuur test-e-mail van %s naar:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Testen"
 
@@ -10100,10 +10379,10 @@ msgid ""
 "windows you used to edit files in the epub</b>.</p><p>Rebuild the ePub, "
 "updating your calibre library.</p>"
 msgstr ""
-"<p>Pak de ePub uit om de inhoud in een verkenner te tonen. Rechtsklik op "
+"<p>Pak de ePub uit om de inhoud in een browser te tonen. Rechtsklik op "
 "bestanden en kies 'Openen met..' jouw tekstverwerker. Wanneer de "
-"aanpassingen compleet zijn sluit dan de verkenner <b> en de tekstverwerker "
-"die je gebruikt hebt.</b></p><p>Herbouw de ePub en je bibliotheek wordt "
+"aanpassingen compleet zijn sluit dan de browser <b> en de tekstverwerker die "
+"je gebruikt hebt.</b></p><p>Herbouw de ePub en je bibliotheek wordt "
 "bijgewerkt.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:141
@@ -10143,7 +10422,7 @@ msgstr "Feed heeft een URL nodig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:194
 msgid "The feed %s must have a URL"
-msgstr "De feed %s heeft een URL nodig"
+msgstr "Feed %s heeft een URL nodig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:200
 msgid "This feed has already been added to the recipe"
@@ -10171,15 +10450,15 @@ msgstr "Recept vervangen?"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:315
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:342
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
-msgstr "Een persoonlijk recept genaat %s bestaat al. Wilt u deze vervangen?"
+msgstr "Een persoonlijk recept genaamd %s bestaat al. Wil je dit vervangen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:282
 msgid "Choose builtin recipe"
-msgstr ""
+msgstr "Kies ingebouwd recept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:328
 msgid "Choose a recipe file"
-msgstr "Kies een recept"
+msgstr "Kies een receptbestand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:329
 msgid "Recipes"
@@ -10190,14 +10469,16 @@ msgid ""
 "You will lose any unsaved changes. To save your changes, click the "
 "Add/Update recipe button. Continue?"
 msgstr ""
+"Alle niet-bewaarde wijzigingen zullen teloorgaan. Klik op de 'Voeg "
+"Toe/Update recept'-knop. Verder gaan?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:257
 msgid "Add custom news source"
-msgstr "Voeg een persoonlijke nieuws bron toe"
+msgstr "Voeg een persoonlijke nieuwsbron toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:258
 msgid "Available user recipes"
-msgstr "Beschikbare gebruikers recepten"
+msgstr "Beschikbare gebruikersrecepten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:259
 msgid "Add/Update &recipe"
@@ -10213,7 +10494,7 @@ msgstr "&Deel recept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "S&how recipe files"
-msgstr ""
+msgstr "t&Oon receptbestanden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263
 msgid "Customize &builtin recipe"
@@ -10243,13 +10524,13 @@ msgstr ""
 "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;\">Maak een simpel nieuws "
-"recept, door RSS feeds toe te voegen.<br />Voor de meeste feeds zul je "
-"daarna de \"geavanceerde modus\" moeten gebruiken om het download process in "
+"recept, door RSS-feeds toe te voegen.<br />Voor de meeste feeds zul je "
+"daarna de \"geavanceerde modus\" moeten gebruiken om het downloadproces in "
 "te kunnen stellen.</p></body></html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
 msgid "Recipe &title:"
-msgstr "Recept &title:"
+msgstr "Recept &titel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271
 msgid "&Oldest article:"
@@ -10265,7 +10546,7 @@ msgstr "&Max. aantal artikelen per feed:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "Maximum number of articles to download per feed."
-msgstr "Maximum aantal artikelen te downloaden per feed:"
+msgstr "Maximaal aantal artikelen te downloaden per feed:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276
 msgid "Feeds in recipe"
@@ -10273,7 +10554,7 @@ msgstr "Feeds in recept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:278
 msgid "Remove feed from recipe"
-msgstr "Verwijder van recept"
+msgstr "Verwijder uit recept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:281
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:284
@@ -10282,11 +10563,11 @@ msgstr "Voeg feed toe aan recept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:282
 msgid "&Feed title:"
-msgstr "&Feed titel:"
+msgstr "Titel &feed:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:283
 msgid "Feed &URL:"
-msgstr "Feed &URL:"
+msgstr "&URL Feed:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:285
 msgid "&Add feed"
@@ -10297,13 +10578,13 @@ msgid ""
 "For help with writing advanced news recipes, please visit <a "
 "href=\"http://calibre-ebook.com/user_manual/news.html\">User Recipes</a>"
 msgstr ""
-"Voor hulp met het schrijven van geavanceerde nieuwsrecepten bezoek je <a "
-"href=\"http://calibre-ebook.com/user_manual/news.html\">Gebruikers "
-"recepten</a>"
+"Voor hulp bij het schrijven van geavanceerde nieuwsrecepten bezoek  <a "
+"href=\"http://calibre-"
+"ebook.com/user_manual/news.html\">Gebruikersrecepten</a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:287
 msgid "Recipe source code (python)"
-msgstr "Recept bron code (python)"
+msgstr "Broncode recept (python)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dnd.py:51
 msgid "Download %s"
@@ -10311,74 +10592,74 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dnd.py:54
 msgid "Downloading <b>%s</b> from %s"
-msgstr ""
+msgstr "<b>%s</b> downloaden  van %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dnd.py:84
 msgid "Download failed"
-msgstr ""
+msgstr "Download mislukt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dnd.py:85
 msgid "Failed to download from %r with error: %s"
-msgstr ""
+msgstr "Download vanuit %r mislukt met fout: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
-msgstr "Email %s to %s"
+msgstr "e-mail %s naar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Nieuws:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
-msgstr "Bijgesloten is de %s periodiek gedownload door calibre."
+msgstr "Bijgesloten is de periodiek %s gedownload door calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-Boek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
-msgstr "In de bijlage vind je het e-boek."
+msgstr "In de bijlage vind je het e-boek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "door"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
-msgstr "in het %s formaat"
+msgstr "in het %s-formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
-msgstr "Versturen van email naar"
+msgstr "Versturen van e-mail naar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
-"Auto-converteer de volgende boeken alvorens ze via email te versturen?"
+"Auto-converteer de volgende boeken alvorens ze via e-mail te versturen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
-"De volgende boeken konden niet worden ge-emailed omdat geen beschikbare "
+"De volgende boeken konden niet worden ge-e-maild omdat geen beschikbare "
 "formaten zijn gevonden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
-msgstr "Mislukt boek te emailen"
+msgstr "e-mailen van boek mislukt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "verzonden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Nieuws verzonden naar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10391,67 +10672,95 @@ msgid ""
 "group names for the various metadata entries are documented in "
 "tooltips.</p></div>"
 msgstr ""
+"<div style=\"font-size:10pt;\">\n"
+"<p>Geef een regexppatroon om metagegevens te raden uitgaande van "
+"bestandsnamen. </p>\n"
+"<p>Een Engelstalige <a href=\"http://calibre-"
+"ebook.com/user_manual/regexp.html\">tutorial</a> voor regexps  is "
+"beschikbaar.</p>\n"
+"<p>Gebruik de <b>Test</b>functionaliteit hieronder om je regexp uit te "
+"proberen op een paar voorbeelden van bestandsnamen (vergeet niet om de "
+"extensie mee op te geven). De groepsnamen voor de verschillende metadata "
+"zijn gedocumenteerd in de  tooltips.</p></div>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
-msgstr "Reguliere &expressie"
+msgstr "Reguliere &uitdrukking"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
-msgstr "Bestands &naam:"
+msgstr "Bestands&naam:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Titel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
-msgstr "Reguliere expressie (?P&lt;titel&gt;)"
+msgstr "Regexp (?P&lt;titel&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Geen overeenkomst"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Auteurs:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
-msgstr "Reguliere expressie (?P<auteur>)"
+msgstr "Regexp (?P<auteur>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
-msgstr "Serie:"
+msgstr "Reeks:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
-msgstr "Reguliere expressie (?P<serie>)"
+msgstr "Regexp (?P<reeks>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
-msgstr "Serie Index"
+msgstr "Reeksindex"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
-msgstr "Reguliere expressie (?P<serie_index>)"
+msgstr "Regexp (?P<reeks_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
-msgstr "Reguliere expressie (?P<isbn>)"
+msgstr "Regexp (?P<isbn>)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
@@ -10518,7 +10827,7 @@ msgstr "Werktijd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76
 msgid "There are %d running jobs:"
-msgstr "Er zijn %d draaiende werkopdrachten:"
+msgstr "Er zijn %d draaiende taken:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:87
@@ -10528,7 +10837,7 @@ msgstr "Onbekende taak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:83
 msgid "There are %d waiting jobs:"
-msgstr "Er zijn %d wachtende werkopdrachten:"
+msgstr "Er zijn %d wachtende taken:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:222
@@ -10538,7 +10847,7 @@ msgstr "Opdracht kan niet worden afgebroken"
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
-"Taken die met het apparaat communicaren kunnen niet worden afgebroken"
+"Taken die met het apparaat communiceren kunnen niet worden afgebroken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:223
 msgid "Job has already run"
@@ -10550,7 +10859,7 @@ msgstr "Niet beschikbaar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:294
 msgid "Jobs:"
-msgstr "Opdrachten"
+msgstr "Opdrachten:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:296
 msgid "Shift+Alt+J"
@@ -10566,11 +10875,11 @@ msgstr " - Taken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:424
 msgid "Do you really want to stop the selected job?"
-msgstr ""
+msgstr "Wil je de geselecteerde taak echt stoppen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:430
 msgid "Do you really want to stop all non-device jobs?"
-msgstr ""
+msgstr "Wil je echt alle niet-apparaatgebonden taken stoppen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:53
 msgid "Eject this device"
@@ -10578,7 +10887,7 @@ msgstr "Ontkoppel dit apparaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
 msgid "Show books in calibre library"
-msgstr "Geef de boeken in de calibre bibliotheek weer"
+msgstr "Geef de boeken in de calibrebibliotheek weer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
 msgid "Show books in the main memory of the device"
@@ -10610,7 +10919,7 @@ msgstr "beschikbaar"
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
-"De weergave van boeken zal beperkt worden tot de criteria die aan de "
+"Boekweergave zal beperkt worden tot die boeken die aan de criteria van de "
 "geselecteerde zoekopdracht voldoen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:171
@@ -10626,8 +10935,8 @@ 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 titel, auteur, uitgever, labels, "
-"commentaar, enz.<br><br>Woorden gescheiden door spaties worden samengevoegd"
+"<p>Doorzoek de boekenlijst gesorteerd op titel, auteur, uitgever, labels, "
+"commentaar, enz.<br><br>Woorden gescheiden door spaties moeten alle voorkomen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:185
 msgid "&Go!"
@@ -10643,7 +10952,7 @@ msgstr "Snelzoeken wissen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:203
 msgid "Change the way searching for books works"
-msgstr ""
+msgstr "Verander de manier om boeken te zoeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:215
 msgid "Copy current search text (instead of search name)"
@@ -10665,50 +10974,50 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Sjabloon bewerken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Op het apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Grootte (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Boek %s van %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "De zoekopdracht is \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "De UUID van dit boek is \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "In de bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Grootte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Gemarkeerd voor wissen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
-msgstr "Dubbel-klik om me te <b>wijzigen</b><br><br>"
+msgstr "Dubbelklik om me te <b>wijzigen</b><br><br>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:156
 msgid "Hide column %s"
@@ -10728,7 +11037,7 @@ msgstr "Aflopend"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:177
 msgid "Change text alignment for %s"
-msgstr "Verander de uitlijning van de text voor %s"
+msgstr "Verander de uitlijning van de tekst voor %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:179
 msgid "Left"
@@ -10748,7 +11057,7 @@ msgstr "Geef kolom weer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:211
 msgid "Restore default layout"
-msgstr "Herstel standaard layout"
+msgstr "Herstel standaardlayout"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:790
 msgid ""
@@ -10756,7 +11065,7 @@ msgid ""
 "library."
 msgstr ""
 "Direct op een device loslaten is niet ondersteund. Voeg het boek eerst toe "
-"aan de calibre bibliotheek"
+"aan de calibrebibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:52
 msgid "Configure Viewer"
@@ -10777,38 +11086,38 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
-msgstr " - LRF Viewer"
+msgstr " - LRF-Viewer"
 
 #: /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 "<b>Geen Resultaten</b> voor de zoekterm <i>%s</i> gevonden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Geen resultaten gevonden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
-msgstr "LRF Viewer"
+msgstr "LRF-Viewer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
-msgstr "Parsering LRF bestand"
+msgstr "parsing LRF-bestand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
-msgstr "LRF viewer werkbalk"
+msgstr "werkbalk LRF-viewer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
-msgstr "Volgende Pagina"
+msgstr "Volgende pagina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
-msgstr "Vorige Pagina"
+msgstr "Vorige pagina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
@@ -10827,7 +11136,7 @@ msgstr "Volgende overeenkomst"
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Open ebook"
-msgstr "Open eboek"
+msgstr "Open e-boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
@@ -10843,26 +11152,28 @@ msgstr "Start geminimaliseerd in het systeemvak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
 msgid "Log debugging information to console"
-msgstr "Schrijf foutoplossings informatie naar console"
+msgstr "Schrijf debuginformatie naar console"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
-msgstr "Check niet voor updates"
+msgstr "Controleer niet of er updates zijn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:38
 msgid ""
 "Ignore custom plugins, useful if you installed a plugin that is preventing "
 "calibre from starting"
 msgstr ""
+"Negeer aangepaste plug-ins. Nuttig als je een plug-in installeerde die "
+"calibre belet om op te starten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:678
 msgid "Calibre Library"
-msgstr "Calibre Bibliotheek"
+msgstr "Calibrebibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
 msgid "Choose a location for your calibre e-book library"
-msgstr "Kies een locatie voor uw calibre e-book bibliotheek"
+msgstr "Kies een locatie voor je calibrebibliotheek van e-boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:98
 msgid "Failed to create library"
@@ -10870,16 +11181,16 @@ msgstr "Creëren van de bibliotheek is mislukt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
 msgid "Failed to create calibre library at: %r."
-msgstr "Mislukken van de creatie van de calibre bibliotheek in: %r."
+msgstr "Creëren van de bibliotheek is mislukt op plaats %r."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
 msgid "Choose a location for your new calibre e-book library"
-msgstr "Kies een locatie voor uw nieuwe calibre e-book bibliotheek"
+msgstr "Kies een locatie voor je nieuwe calibrebibliotheek van e-boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
 msgid "Initializing user interface..."
-msgstr "Starten gebruikers interface..."
+msgstr "Starten gebruikersinterface..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:182
 msgid "Repairing failed"
@@ -10894,11 +11205,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:197
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:229
 msgid "Bad database location"
-msgstr "Ongeldige database locatie"
+msgstr "Ongeldige databaselocatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
 msgid "Bad database location %r. calibre will now quit."
-msgstr "Verkeerde database locatie %r. calibre wordt nu afgesloten."
+msgstr "Verkeerde databaselocatie %r. calibre wordt nu afgesloten."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:210
 msgid "Corrupted database"
@@ -10910,9 +11221,9 @@ msgid ""
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
-"Uw calibre database lijkt te zijn beschadigd. Wilt u dat calibre tracht deze "
-"automatisch te herstellen? Indien u nee antwoord, zal er een nieuwe lege "
-"calibre database gecreëerd worden."
+"Je calibredatabank lijkt te zijn beschadigd. Wil je dat calibre tracht deze "
+"automatisch te herstellen? Indien je nee antwoord, zal er een nieuwe lege "
+"calibredatabank gecreëerd worden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
 msgid ""
@@ -10925,7 +11236,7 @@ msgstr ""
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
-"Slechte database locatie %r. Zal starten met een nieuwe, lege calibre "
+"Slechte databaselocatie %r. Zal starten met een nieuwe, lege calibre "
 "bibliotheek."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
@@ -10938,15 +11249,15 @@ msgstr "Weet je zeker dat het niet draait?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:323
 msgid "may be running in the system tray, in the"
-msgstr "kan in het systeemvak draaien, in de"
+msgstr "kan in het systeemvak draaien, in het"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:325
 msgid "upper right region of the screen."
-msgstr "recht boven regio van het scherm."
+msgstr "gebied rechtsboven het scherm."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:327
 msgid "lower right region of the screen."
-msgstr "recht onder regio van het scherm."
+msgstr "gebied rechtsonder het scherm."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:330
 msgid "try rebooting your computer."
@@ -10970,8 +11281,8 @@ 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 ""
-"Verwijs console output naar een dialoog venster (zowel stdout als stderr). "
-"Handig onder Windows waar GUI applicatie geen output stream hebben."
+"Verwijs console-uitvoer naar een dialoogvenster (zowel stdout als stderr). "
+"Handig onder Windows waar GUI-applicaties geen outputstream hebben."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:113
 msgid "&Preferences"
@@ -10983,49 +11294,52 @@ msgstr "&Afsluiten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:138
 msgid "Unhandled exception"
-msgstr ""
+msgstr "Exceptie niet opgevangen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:111
 msgid "Title &sort:"
-msgstr ""
+msgstr "&Sorteertitel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:220
 msgid "Author s&ort:"
-msgstr ""
+msgstr "S&orteerauteur:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:348
 msgid "&Number:"
-msgstr ""
+msgstr "&Nummer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:716
 msgid "Invalid cover"
-msgstr ""
+msgstr "Ongeldige omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:717
 msgid "Could not change cover as the image is invalid."
-msgstr ""
+msgstr "Kan omslag niet veranderen: ongeldige afbeelding."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:744
 msgid "This book has no cover"
-msgstr ""
+msgstr "Dit boek heeft geen omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:794
 msgid "stars"
-msgstr ""
+msgstr "sterren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:828
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any wordsor phrases, separated by commas."
 msgstr ""
+"Labels geven eigenschappen van een boek. Dit is erg handig bij het "
+"zoeken.<br><br>Ze bestaan uit een woord of frase en worden gescheiden door "
+"komma's."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:927
 msgid "&Publisher:"
-msgstr ""
+msgstr "Uitgever:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:997
 msgid "Clear date"
-msgstr ""
+msgstr "Verwijder datum"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:109
 msgid "Book has neither title nor ISBN"
@@ -11037,7 +11351,7 @@ msgstr "Geen overeenkomsten gevonden voor dit boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:187
 msgid "Failed to download metadata"
-msgstr "Metagegevens downloaden mislukt"
+msgstr "Downloaden metagegevens mislukt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:227
 msgid "cover"
@@ -11062,7 +11376,7 @@ msgstr "Voltooid"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:292
 msgid "Successfully downloaded metadata for %d out of %d books"
-msgstr "Metagegevens downloaden succesvol voor %d van %d boeken"
+msgstr "Downloaden metagegevens succesvol voor %d van %d boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:294
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:765
@@ -11072,16 +11386,16 @@ msgstr "Details"
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:214
 msgid "Edit Metadata"
-msgstr ""
+msgstr "Editeer metagegevens"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:443
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:604
 msgid "Change cover"
-msgstr ""
+msgstr "Verander omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:491
 msgid "Co&mments"
-msgstr ""
+msgstr "Commentaar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:513
 msgid "&Metadata"
@@ -11089,31 +11403,31 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:518
 msgid "&Cover and formats"
-msgstr ""
+msgstr "Omsla&g en formaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:573
 msgid "C&ustom metadata"
-msgstr ""
+msgstr "Aangepaste metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:36
 msgid ""
 "Restore settings to default values. You have to click Apply to actually save "
 "the default settings."
 msgstr ""
-"Zet instellingen terug naar standaard. Klik Apply om deze standaard "
-"instellingen te bewaren."
+"Zet instellingen terug naar standaard. Klik 'Pas toe' om deze "
+"standaardinstellingen te bewaren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding.py:28
 msgid "Ignore duplicate incoming formats"
-msgstr ""
+msgstr "Negeer dubbels van inkomende formaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding.py:29
 msgid "Overwrite existing duplicate formats"
-msgstr ""
+msgstr "Overschrijf al bestaande formaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding.py:30
 msgid "Create new record for each duplicate format"
-msgstr ""
+msgstr "Creëer nieuwe record voor elk dubbel formaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:65
 msgid ""
@@ -11121,13 +11435,13 @@ msgid ""
 "to it. calibre can either read metadata from the contents of the file, or "
 "from the filename."
 msgstr ""
-"Hier kun je instellen hoe Calibre metagegevens zal lezen uit toe te voegen "
-"bestanden. Calibre kan metagegevens uit het bestand lezen, of uit de "
-"bestandsnaam samenstellen."
+"Hier kan je instellen hoe Calibre metagegevens zal lezen uit toe te voegen "
+"bestanden. Calibre kan metagegevens uit het bestand lezen, of samenstellen "
+"uit de bestandsnaam."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:66
 msgid "Read &metadata from &file contents rather than file name"
-msgstr ""
+msgstr "Haal metadata uit bestands&inhoud in plaats van bestandsnaam"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:67
 msgid ""
@@ -11139,7 +11453,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:68
 msgid "&Swap author firstname and lastname"
-msgstr "&Verwissel auteur voornaam en achternaam"
+msgstr "&Verwissel voornaam en achternaam auteur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:69
 msgid ""
@@ -11153,10 +11467,19 @@ msgid ""
 "Title match ignores leading indefinite articles (\"the\", \"a\", \"an\"), "
 "punctuation, case, etc. Author match is exact."
 msgstr ""
+"Automatisch invoegen: als er boeken met gelijkaardige titel en auteur worden "
+"gevonden worden inkomende formaten \n"
+"automatisch bij de bestaande boekrecords toegevoegd. Het vak rechts geeft "
+"aan wat gebeurt als de bestaande record \n"
+"het formaat al heeft. Merk op dat deze ook de `kopieer naar bibliotheek'-"
+"actiebeënvloedt.\n"
+"\n"
+"Titelvergelijking negeert (Engelse) lidwoorden, leestekens, grote/kleine "
+"lettersenzovoorts. Vergelijking van auteurs is exact."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:74
 msgid "&Automerge added books if they already exist in the calibre library:"
-msgstr ""
+msgstr "Voeg boeken in als ze al bestaan in de calibrebibliotheek:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:75
 msgid ""
@@ -11177,10 +11500,23 @@ msgid ""
 "punctuation, case, etc.\n"
 "Author matching is exact."
 msgstr ""
+"Automatisch invoegen: als er boeken met gelijkaardige titel en auteur worden "
+"gevonden worden inkomende formaten \n"
+"automatisch bij de bestaande boekrecords toegevoegd. Dit vak geeft aan wat "
+"gebeurt als de bestaande record \n"
+"het formaat al heeft:\n"
+"Negeer inkomende bestanden - bestaande bestanden in je bibliotheek worden "
+"niet overschreven\n"
+"Overschrijf bestaande bestanden - bestaande bestanden worden uit je "
+"bibliotheek verwijderd.\n"
+"Maak een nieuwe record voor elke dubbel - als er een duplicaat is wordt een "
+"nieuwe boekrecord aangemaakt voor elk duplicaat\n"
+"Titelvergelijking negeert (Engelse) lidwoorden, leestekens, grote/kleine "
+"lettersenzovoorts. Vergelijking van auteurs is exact."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:85
 msgid "&Tags to apply when adding a book:"
-msgstr ""
+msgstr "Te gebruiken labels voor een nieuw boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:86
 msgid ""
@@ -11207,11 +11543,11 @@ msgstr "Hoog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:36
 msgid "Very low"
-msgstr ""
+msgstr "Zeer laag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:164
 msgid "Confirmation dialogs have all been reset"
-msgstr "Bevestiging dialogen zijn allemaal gereset"
+msgstr "Confirmatiedialogen zijn allemaal gereset"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:131
 msgid "&Overwrite author and title by default when fetching metadata"
@@ -11219,15 +11555,15 @@ msgstr "&Overschrijf auteur en titel standaard met geladen metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:132
 msgid "Download &social metadata (tags/ratings/etc.) by default"
-msgstr "Download &sociale metadata (labels, waarderingen, etc) standaard"
+msgstr "Download standaard &sociale metadata (labels, waarderingen, etc)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:133
 msgid "Show notification when &new version is available"
-msgstr "Notificeer als een &nieuwe versie beschikbaar is"
+msgstr "Laat weten als een &nieuwe versie beschikbaar is"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:134
 msgid "Automatically send downloaded &news to ebook reader"
-msgstr "Zend gedownload &nieuws automatisch naar eboek lezer"
+msgstr "Stuur gedownload &nieuws automatisch naar e-boeklezer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:135
 msgid "&Delete news from library when it is automatically sent to reader"
@@ -11237,14 +11573,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:136
 msgid "Default network &timeout:"
-msgstr "Standaard netwerk &timeout:"
+msgstr "Standaard netwerk&time-out:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:137
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
-"Geef de standaard timeout voor netwerk downloads. (bv. wanneer we informatie "
+"Geef de standaard time-out voor netwerkdownloads. (bv. wanneer we informatie "
 "van het Internet moeten halen)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:138
@@ -11253,15 +11589,15 @@ msgstr " seconden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:142
 msgid "Job &priority:"
-msgstr "werk &prioriteit:"
+msgstr "&prioriteit van taak:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:143
 msgid "Preferred &output format:"
-msgstr "Voorkeur &uitvoer formaat:"
+msgstr "Voorkeursformaat voor&uitvoer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:144
 msgid "Restriction to apply when the current library is opened:"
-msgstr "aan te brengen beperkingen de huidige bibliotheek wordt geopend:"
+msgstr "te gebruiken beperkingen als de huidige bibliotheek wordt geopend:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:145
 msgid ""
@@ -11269,17 +11605,17 @@ msgid ""
 "used. Also applied when switching to this library. Note that this setting is "
 "per library. "
 msgstr ""
-"Pas deze beperking to bij opstarten van calibre als de huidige bibliotheek "
+"Pas deze beperking toe bij opstarten van calibre als de huidige bibliotheek "
 "in gebruik is. Ook gebruikt als naar deze bibliotheek wordt overgeschakeld. "
 "NB. Deze instelling is per bibliotheek. "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:146
 msgid "Reset all disabled &confirmation dialogs"
-msgstr "Reset alle uitgeschakelde &bevestiging dialogen"
+msgstr "Reset alle uitgeschakelde &confirmatiedialogen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:147
 msgid "Preferred &input format order:"
-msgstr "Voorkeur &invoer formaat volgorde:"
+msgstr "Voorkeursformaten voor &invoer in volgorde:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:150
 msgid "Use internal &viewer for:"
@@ -11287,7 +11623,7 @@ msgstr "Gebruik interne &viewer voor:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:96
 msgid "You must select a column to delete it"
-msgstr "Om een kolom te verwijderen moet u deze eerst selecteren"
+msgstr "Om een kolom te verwijderen moet je deze eerst selecteren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:101
 msgid "The selected column is not a custom column"
@@ -11295,7 +11631,7 @@ msgstr "De geselecteerde kolom is geen \"custom\" kolom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:103
 msgid "Do you really want to delete column %s and all its data?"
-msgstr "Wilt u werkelijk kolom %s en al zijn gegevens verwijderen?"
+msgstr "Wil je echt kolom %s en al zijn gegevens verwijderen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:82
@@ -11304,13 +11640,13 @@ msgid ""
 "book list. You can hide columns by unchecking them. You can also create your "
 "own, custom columns."
 msgstr ""
-"Hier kun je de opmaak van de kolommen in de Calibre boekenlijst wijzigen. Je "
-"kunt kolommen verwijderen door het vinkje uit te zetten. Je kunt ook zelf "
-"kolommen maken."
+"Hier kan je de opmaak van de kolommen in de boekenlijst van calibre "
+"wijzigen. Je kunt kolommen verwijderen door het vinkje uit te zetten. Je "
+"kunt ook zelf kolommen maken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:88
 msgid "Move column up"
-msgstr ""
+msgstr "Kolom naar omhoog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:90
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:84
@@ -11329,12 +11665,12 @@ msgstr "Bewerk een door de gebruiker gedefinieerde kolom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:96
 msgid "Move column down"
-msgstr ""
+msgstr "Kolom naar omlaag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:91
 msgid "Add &custom column"
-msgstr "Voeg eigen &Column toe"
+msgstr "Voeg eigen &kolom toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion.py:41
 msgid ""
@@ -11346,36 +11682,36 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:18
 msgid "Text, column shown in the tag browser"
-msgstr "Text, kolom weergegeven in de labelbrowser"
+msgstr "Tekstkolom, weergegeven in de labelbrowser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:21
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
-"Door comma's gescheiden text, zoals labels, weergeven in de labelbrowser."
+"Door komma's gescheiden tekst, zoals labels, weergeven in de labelbrowser."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:24
 msgid "Long text, like comments, not shown in the tag browser"
-msgstr "Lange tekst, zoals commentaren, niet weergegeven in de labelbrowser"
+msgstr "Lange tekst, zoals commentaar, niet weergegeven in de labelbrowser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:27
 msgid "Text column for keeping series-like information"
-msgstr "Text kolom voor het bewaren van series informatie"
+msgstr "Tekstkolom voor het bewaren van informatie over reeks"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:30
 msgid "Text, but with a fixed set of permitted values"
-msgstr ""
+msgstr "Tekst, maar met een lijst van toegestane waarden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:34
 msgid "Floating point numbers"
-msgstr "Floating point numbers"
+msgstr "Vlottendpuntgetallen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:36
 msgid "Integers"
-msgstr "Integers"
+msgstr "Gehele getallen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:38
 msgid "Ratings, shown with stars"
-msgstr "Waarderingen,met sterren aangegeven"
+msgstr "Waardering met sterren aangegeven"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:64
@@ -11386,25 +11722,25 @@ msgstr "Ja/Nee"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:43
 msgid "Column built from other columns"
-msgstr "Column gemaakt van andere columns"
+msgstr "Kolom gemaakt van andere kolommen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:51
 msgid "Create a custom column"
-msgstr ""
+msgstr "Maak een"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:62
 msgid "Quick create:"
-msgstr ""
+msgstr "Maak snel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:149
 msgid "Modified Date"
-msgstr ""
+msgstr "Datum gezijzigd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 msgid "People's names"
-msgstr ""
+msgstr "Namen van personen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 msgid "Number"
@@ -11417,7 +11753,7 @@ msgstr "Tekst"
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:87
 msgid "Edit a custom column"
-msgstr ""
+msgstr "Editeer een handgemaakte kolom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:91
 msgid "No column selected"
@@ -11433,31 +11769,31 @@ msgstr "Geselecteerde kolom is geen door de gebruiker gedefinieerde kolom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:146
 msgid "My Tags"
-msgstr ""
+msgstr "Mijn Labels"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:147
 msgid "My Series"
-msgstr ""
+msgstr "Mijn Reeksen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:148
 msgid "My Rating"
-msgstr ""
+msgstr "Mijn Waardering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:150
 msgid "People"
-msgstr ""
+msgstr "Mensen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:179
 msgid "No lookup name was provided"
-msgstr "Er was geen opzoek naam gegeven"
+msgstr "Er was geen opzoeknaam gegeven"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:183
 msgid ""
 "The lookup name must contain only lower case letters, digits and "
 "underscores, and start with a letter"
 msgstr ""
-"De zoekterm mag slechts kleine letters, cijfers en underscores bevatten en "
-"moet beginnen met een letter"
+"De zoekterm mag slechts kleine letters, cijfers en lage streepjes bevatten "
+"en moet beginnen met een letter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:186
 msgid ""
@@ -11465,11 +11801,11 @@ msgid ""
 "the index of a series column."
 msgstr ""
 "Opzoeknamen kunnen niet eindigen met _index, omdat deze namen gereserveerd "
-"zijn voor de index van een Serie column."
+"zijn voor de index van een reekskolom."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:196
 msgid "No column heading was provided"
-msgstr "Er was geen kolom koptekst gegeven"
+msgstr "Er was geen koptekst voor de kolom gegeven"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:206
 msgid "The lookup name %s is already used"
@@ -11481,27 +11817,27 @@ msgstr "De koptekst %s is al in gebruik"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:229
 msgid "You must enter a template for composite columns"
-msgstr "Je moet een template opgeven voor compositie columns"
+msgstr "Je moet een sjabloon opgeven voor samengestelde kolommen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:238
 msgid "You must enter at least one value for enumeration columns"
-msgstr ""
+msgstr "Minstens een waarde toestaan kolom met waardebeperking"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:242
 msgid "You cannot provide the empty value, as it is included by default"
-msgstr ""
+msgstr "De lege waarde kan je niet opgeven, want die mag altijd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:246
 msgid "The value \"{0}\" is in the list more than once"
-msgstr ""
+msgstr "Waarde  \"{0}\" staat meer dan een keer in de lijst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:190
 msgid "&Lookup name"
-msgstr "&Lookup naam"
+msgstr "&Zoeknaam"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:191
 msgid "Column &heading"
-msgstr "Kolom koptekst"
+msgstr "Koptekst kolom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:192
 msgid ""
@@ -11515,15 +11851,15 @@ 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"
+"Kolomhoofd in de bibliotheekweergave. Is ook categorienaam in de labelbrowser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:194
 msgid "&Column type"
-msgstr ""
+msgstr "Type &kolom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:195
 msgid "What kind of information will be kept in the column."
-msgstr "Wat voor soort gegevens zal er in de kolom opgeslagen worden"
+msgstr "Soort gegevens die in de kolom opgeslagen zullen worden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:196
 msgid ""
@@ -11532,19 +11868,23 @@ msgid ""
 "a red X.\n"
 "Everything else will show nothing."
 msgstr ""
+"Toon aanvinkwaarden in de GUI. De waarden 'ja', 'aangevinkt' en 'true'\n"
+"geven een groene vink, de waarden 'nee', 'niet aangevinkt' en 'false'\n"
+"geven een rode X.\n"
+"Al de rest (dus ook 'neen') geeft een leeg vakje."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:199
 msgid "Show checkmarks"
-msgstr ""
+msgstr "Toon aanvinkwaarden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:200
 msgid ""
 "Check this box if this column contains names, like the authors column."
-msgstr ""
+msgstr "Vink dit vakje aan als de kolom namen bevat zoals de auterskolom."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:201
 msgid "Contains names"
-msgstr ""
+msgstr "Bevat namen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:202
 msgid ""
@@ -11556,8 +11896,8 @@ msgid ""
 "<li>dd MMMM yy gives 05 January 10</li>\n"
 "</ul> "
 msgstr ""
-"<p>Datum formaat. Gebruik 1-4 'd's voor dag, 1-4 'M's voor maand, and 2 or 4 "
-"'y's voor het jaar.</p>\n"
+"<p>Datumformaat. Gebruik 1-4 'd's voor dag, 1-4 'M'-en voor maand, and 2 or "
+"4 'y'-en voor het jaar.</p>\n"
 "<p>bv:\n"
 "<ul>\n"
 "<li> ddd, d MMM yyyy geeft Maa, 5 Jan 2010<li>\n"
@@ -11574,19 +11914,19 @@ msgstr "Standaard: dd MMM yyyy."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:210
 msgid "Format for &dates"
-msgstr "&Datum formaat"
+msgstr "&Datumformaat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:211
 msgid "&Template"
-msgstr "&Template"
+msgstr "&Sjabloon"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:212
 msgid "Field template. Uses the same syntax as save templates."
-msgstr ""
+msgstr "Sjabloon voor kolomveld. Zelfde syntax als bewaarsjabloon."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:213
 msgid "Similar to save templates. For example, {title} {isbn}"
-msgstr "Gelijk aan opslagtemplates. Bijvoorbeeld, {title} {isbn}"
+msgstr "Gelijk aan bewaarsjabloon. Bijvoorbeeld, {title} {isbn}"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:214
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:224
@@ -11595,23 +11935,24 @@ msgstr "Standaard: (niets)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:215
 msgid "&Sort/search column by"
-msgstr ""
+msgstr "&Sorteren en opzoeken in kolom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:216
 msgid "How this column should handled in the GUI when sorting and searching"
-msgstr ""
+msgstr "Hoe de kolom gesorteerd en doorzocht wordt in de GUI."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:217
 msgid "If checked, this column will appear in the tags browser as a category"
 msgstr ""
+"Als aangevinkt zal de kolom als categorie in de labelbrowser verschijnen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:218
 msgid "Show in tags browser"
-msgstr ""
+msgstr "Toon on labelbrowser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:219
 msgid "Values"
-msgstr "Waardes"
+msgstr "Waarden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:220
 msgid ""
@@ -11619,14 +11960,17 @@ msgid ""
 "included, and is the default. For example, the list 'one,two,three' has\n"
 "four values, the first of them being the empty value."
 msgstr ""
+"Lijst van toegestane waarden gescheiden door komma's. De lege waarde is\n"
+"impliciet toegestaan en is de standaardwaarde. Zo bevat de lijst 'een,twee,\n"
+"drie' vier waarden, en de eerste is de lege waarde."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:223
 msgid "The empty string is always the first value"
-msgstr ""
+msgstr "Het lege woord is altijd de eerste waarde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:21
 msgid "Getting debug information"
-msgstr "Verkrijg foutoplos informatie"
+msgstr "Verkrijg debuginformatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:22
 msgid "Copy to &clipboard"
@@ -11634,7 +11978,7 @@ msgstr "Copieër naar klembord"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:24
 msgid "Debug device detection"
-msgstr "Zoek fouten in apparaat detectie"
+msgstr "Zoek fouten in apparaatdetectie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:66
 msgid ""
@@ -11642,17 +11986,17 @@ msgid ""
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
-"calibre kan boeken naar jou (of je reader) sturen via email. Emails worden "
-"automatisch gestuurd voor gedownload nieuws naar alle email adressen "
+"calibre kan boeken naar jou (of je lezer) sturen via e-mail. E-mails worden "
+"automatisch gestuurd voor gedownload nieuws naar alle e-mailadressen "
 "waarvoor automatisch opsturen is aangevinkt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:67
 msgid "Add an email address to which to send books"
-msgstr "Voeg een email adres toe om boeken naar toe te sturen"
+msgstr "Voeg een e-mailadres toe om boeken naar toe te sturen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:68
 msgid "&Add email"
-msgstr "&Voeg email toe"
+msgstr "&Voeg e-mail toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:69
 msgid "Make &default"
@@ -11660,22 +12004,30 @@ msgstr "Maak &standaard"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:70
 msgid "&Remove email"
-msgstr "Verwijde&r email"
+msgstr "Verwijde&r e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Automatisch versturen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
-"Formaat te emailen. Het eerste formaat dat overeenkomt zal worden verstuurd."
+"Formaat om te e-mailen. Het eerste formaat dat overeenkomt zal worden "
+"verstuurd."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11683,9 +12035,9 @@ msgstr ""
 "Indien aangevinkt zal gedownload nieuws automatisch worden verstuurd<br> "
 "naar dit e-mailadres (indien het in een van de vermelde formaten is)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
-msgstr "nieuw email adres"
+msgstr "nieuw e-mailadres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:27
 msgid "Narrow"
@@ -11695,92 +12047,92 @@ msgstr "Smal"
 msgid "Wide"
 msgstr "Breed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Middel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Groot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Altijd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nooit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
-msgstr ""
+msgstr "Op eerste letter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
+msgid "Disabled"
+msgstr "Afgezet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
-msgid "Disabled"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
 msgid "Partitioned"
-msgstr ""
+msgstr "In blokken"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
+msgid "User Interface &layout (needs restart):"
+msgstr "&Lay-out gebruikersinterface (heeft een herstart nodig):"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
+msgid "&Number of covers to show in browse mode (needs restart):"
+msgstr "&Aantal omslagen zichtbaar in browsermodus (herstart nodig)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+msgid "Choose &language (requires restart):"
+msgstr "Kies &taal (herstart nodig)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
-msgid "User Interface &layout (needs restart):"
-msgstr "Gebruikers Interface &layout (heeft een herstart nodig):"
+msgid "Show &average ratings in the tags browser"
+msgstr "L&aat de gemiddelde waarderingen in de categorieënbrowser zien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
-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/preferences/look_feel_ui.py:145
-msgid "Choose &language (requires restart):"
-msgstr "Kier &taal (herstart nodig)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
-msgid "Show &average ratings in the tags browser"
-msgstr "L&aat de gemiddelde waarderingen in de categorieenbrowser zien"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
-"Blokkeer alle animaties. Bruikbaar als u een langzame/oude computer heeft."
+"Blokkeer alle animaties. Bruikbaar als je een langzame/oude computer hebt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Blokkeer &animaties"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
-msgstr "Activeer systeemvak icoon"
+msgstr "Activeer icoon systeemvak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Laat het opstartscherm zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
-msgstr "Schakel &notificaties in systeem tray uit"
+msgstr "Schakel &notificaties in systeemtray uit"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+msgid "Use &Roman numerals for series"
+msgstr "Gebruik &romeinse cijfers voor reeksen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+msgid "Show cover &browser in a separate window (needs restart)"
+msgstr "Toon omslag&browser in een apart scherm (herstart nodig)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+msgid "Tags browser category &partitioning method:"
+msgstr "Methode om categorieën van de labelbrowser in te delen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
-msgid "Use &Roman numerals for series"
-msgstr "Gebruik &Romeinse cijfers voor series"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
-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/preferences/look_feel_ui.py:154
-msgid "Tags browser category &partitioning method:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11788,23 +12140,31 @@ msgid ""
 "have a list of fixed-sized groups. Set to disabled\n"
 "if you never want subcategories"
 msgstr ""
+"Geef aan hoe deelcategorieën getoond worden in de labelbrowser\n"
+"als er meer items in zitten dan de limiet. Kies \"Op eerste letter\"\n"
+"om een A, B, C-lijst te krijgen. Kies \"In blokken\" om een lijst van\n"
+"groepen met vaste grootte te krijgen. Kies \"Afgezet\" als je geen\n"
+"deelcategorieën wil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
-msgstr ""
+msgstr "&Klap in als er meer items zijn dan:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
+"Als een kategorie voor de labelbrowser meer dan dit aantal items heeft\n"
+"wordt ze ingedeeld in deelcategorieën. Als de indeling afgezet is dan\n"
+"wordt deze waarde niet gebruikt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
-msgstr ""
+msgstr "Categorieën met hiërarchische items:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11813,53 +12173,55 @@ msgid ""
 "both under 'Mystery'. If 'tags' is not in this box,\n"
 "then the tags will be displayed each on their own line."
 msgstr ""
+"Lijst van kolommen waarvoor waarden met punten op deelcategorieïn\n"
+"wijzen. Bijvoorbeeld, als dit vak 'labels' beat dan zullen labels\n"
+"van de vorm 'Roman.historisch' en 'Roman.humor' getoond worden\n"
+"in een boomstructuur met 'historisch' en 'humor' allebei onder\n"
+"'Roman'. Als 'labels' niet in dit vak is aangegeven dan worden\n"
+"deze labels elk op hun eigen lijn getoond."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Werkbalk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
-msgstr "&Icoon grootte"
+msgstr "&Icoongrootte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
-msgstr "Geef &tekst onder de iconen weer:"
+msgstr "Toon &tekst onder de iconen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Splits de werkbalk in twee werkbalken"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
-msgstr ""
+msgstr "Lettertype voor de interface:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
-msgstr ""
+msgstr "Verander lettertype (herstart nodig)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "Toep&assen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Stan&daard terugzetten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Bewaar veranderingen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Annuleer en terug naar overzicht"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Terugzetten naar standaard niet ondersteund voor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11867,7 +12229,7 @@ msgstr ""
 "Voor sommige van de veranderingen is een herstart nodig. Herstart Calibre zo "
 "snel mogelijk."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11875,51 +12237,51 @@ msgstr ""
 "Voor de veranderingen die je hebt gemaakt moet Calibre onmiddelijk "
 "herstarten. Je kunt geen instellingen meer aanpassen tot je herstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Herstart nodig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:42
 msgid "Failed to install command line tools."
-msgstr "Kan commando regel commandos niet installeren."
+msgstr "Kan commandoregeltools niet installeren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:45
 msgid "Command line tools installed"
-msgstr "commando regel tools geinstalleerd"
+msgstr "Commandoregeltools geïinstalleerd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:46
 msgid "Command line tools installed in"
-msgstr "Commando regel tools geinstalleerd in"
+msgstr "Commandoregeltools geïnstalleerd in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:47
 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 "
+"Indien je calibre.app verplaatst, zullen de commandoregeltools opnieuw "
 "moeten worden geinstalleerd."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:61
 msgid "&Maximum number of waiting worker processes (needs restart):"
-msgstr "&Maximum aantal wachten werk processen (herstart nodig)"
+msgstr "&Maximaal aantal wachten werkprocessen (herstart nodig)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:62
 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"
+"Hoogstens evenveel gelijktijdige werkprocessen als er beschikbare &CPU-"
+"processoren zijn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:63
 msgid "Debug &device detection"
-msgstr "Foutopsporing &apparaat detectie"
+msgstr "Foutopsporing &apparaatdetectie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:64
 msgid "Open calibre &configuration directory"
-msgstr "Open calibre &configuratie folder"
+msgstr "Open &configuratiemap van calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:65
 msgid "&Install command line tools"
-msgstr "Installeer commando regel tools"
+msgstr "Installeer commandoregeltools"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:31
 msgid "Open Editor"
@@ -11938,8 +12300,8 @@ msgid ""
 "That format and device already has a plugboard or conflicts with another "
 "plugboard."
 msgstr ""
-"Dat formaat en apparaat hebben al een pluginset of conflicteren met een "
-"andere pluginset."
+"Dat formaat en apparaat hebben al een plug-inset of conflicteren met een "
+"andere plug-inset."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:261
 msgid "Invalid destination"
@@ -11968,21 +12330,21 @@ msgid ""
 "users might do to force it to use the ';' that the kindle requires. A third "
 "would be to specify the language."
 msgstr ""
-"Hier kun je de metagegevens aanpassen die calibre gebruikt om een boek te "
-"updaten wanneer je deze opslaat of naar een apparaat stuurt.\n"
+"Hier kan je de metagegevens aanpassen die calibre gebruikt om een boek te "
+"updaten wanneer je dit opslaat of naar een apparaat stuurt.\n"
 "\n"
-"Gebuik dit om een 'pluginset' te maken voor een formaat (of alle formaten) "
-"en een apparaat (of alle apparaten). De pluginset geeft aan welke template "
+"Gebuik dit om een 'plug-inset' te maken voor een formaat (of alle formaten) "
+"en een apparaat (of alle apparaten). De plug-inset geeft aan welk sjabloon "
 "is verbonden met welk veld.\n"
 "\n"
-"Vaak zullen templates referenties bevatten naar compositiecolumns, maar dit "
-"hoeft niet. Je kunt elke template gebruiken in een bronveld die je elders in "
-"calibre kunt gebruiken. \n"
+"Vaak zullen sjablonen referenties bevatten naar samengestelde kolommen maar "
+"dit hoeft niet. Je kunt elk sjabloon gebruiken in een bronveld dat je elders "
+"in calibre kunt gebruiken. \n"
 "\n"
-"Een mogelijk gebruik van een pluginset is het veranderen van de titel zodat "
-"deze serie informatie bevat. Een andere kan auteursortering wijzigen, iets "
-"dat mobi-gebruikers zouden kunnen doen om ; te gebruiken, dat bij een kindle "
-"verplicht is."
+"Een mogelijk gebruik van een plug-inset is het opnemen van reeksinformatie "
+"in de titel. Een andere kan auteursortering wijzigen, iets dat mobi-"
+"gebruikers zouden kunnen doen om ';' te gebruiken zoals bij een kindle "
+"verplicht is. Een andere zou het specificeren van een taal kunnen zijn."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:121
 msgid "Format (choose first)"
@@ -11994,15 +12356,15 @@ msgstr "Apparaat (tweede keuze)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:123
 msgid "Add new plugboard"
-msgstr "Toevoegen nieuwe pluginset"
+msgstr "Toevoegen nieuwe plug-inset"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:124
 msgid "Edit existing plugboard"
-msgstr "Wijzig bestaande pluginset"
+msgstr "Wijzig bestaande plug-inset"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:125
 msgid "Existing plugboards"
-msgstr "Bestaande pluginsets"
+msgstr "Bestaande plug-insets"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:126
 msgid "Source template"
@@ -12014,11 +12376,11 @@ msgstr "Bestemmingsveld"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:128
 msgid "Save plugboard"
-msgstr "Pluginset opslaan"
+msgstr "plug-inset opslaan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:129
 msgid "Delete plugboard"
-msgstr "Verwijder pluginset"
+msgstr "Verwijder plug-inset"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:178
 msgid "%(plugin_type)s %(plugins)s"
@@ -12026,7 +12388,7 @@ msgstr "%(plugin_type)s %(plugins)s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:179
 msgid "plugins"
-msgstr "plugins"
+msgstr "plug-ins"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:188
 msgid ""
@@ -12038,19 +12400,19 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:217
 msgid "Search for plugin"
-msgstr ""
+msgstr "Zoek plug-in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:225
 msgid "No matches"
-msgstr ""
+msgstr "Geen overeenkomsten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:226
 msgid "Could not find any matching plugins"
-msgstr ""
+msgstr "Geen overeenkomstige plug-ins gevonden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:267
 msgid "Add plugin"
-msgstr ""
+msgstr "Voeg plug-in toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:275
 msgid ""
@@ -12058,40 +12420,45 @@ msgid ""
 "virus/malware. Only install it if you got it from a trusted source. Are you "
 "sure you want to proceed?"
 msgstr ""
+"Plug-ins toevoegen kan een <b>veiligheidsrisico</b> meebrengen omdat plug-"
+"ins virussen of malware kunnen bevatten. Installeer dan ook enkel plug-ins "
+"uit een vertrouwde bron. Toch doorgaan?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:287
 msgid ""
 "Plugin <b>{0}</b> successfully installed under <b> {1} plugins</b>. You may "
 "have to restart calibre for the plugin to take effect."
 msgstr ""
+"Plugin <b>{0}</b> met succes geïnstalleerd onder<b> {1} plug-ins</b>. "
+"Misschien hmoet je calibre herstarten voor de plug-in werkt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:295
 msgid "No valid plugin path"
-msgstr "Geen geldig plugin pad"
+msgstr "Geen geldig pad voor plug-in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:296
 msgid "%s is not a valid plugin path"
-msgstr "%s is geen geldig plugin pad"
+msgstr "%s is geen geldig pad voor plug-in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:305
 msgid "Select an actual plugin under <b>%s</b> to customize"
-msgstr ""
+msgstr "Kies een plug-in onder <b>%s</b> om aan te passen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:311
 msgid "Plugin cannot be disabled"
-msgstr "Plugin kan niet worden uitgeschakeld"
+msgstr "plug-in kan niet worden uitgeschakeld"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:312
 msgid "The plugin: %s cannot be disabled"
-msgstr "De plugin: %s kan niet worden uitgeschakeld"
+msgstr "De plug-in: %s kan niet worden uitgeschakeld"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:322
 msgid "Plugin not customizable"
-msgstr "Plugin ondersteund geen persoonlijke instellingen"
+msgstr "plug-in ondersteunt geen persoonlijke instellingen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:323
 msgid "Plugin: %s does not need customization"
-msgstr "Plugin %s heeft geen instellingen nodig"
+msgstr "plug-in %s heeft geen instellingen nodig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:329
 msgid "Must restart"
@@ -12101,44 +12468,45 @@ msgstr "Moet herstarten"
 msgid ""
 "You must restart calibre before you can configure the <b>%s</b> plugin"
 msgstr ""
+"Je moet calibre herstarten voor je plug-in <b>%s</b> kan configureren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:335
 msgid "Plugin <b>{0}</b> successfully removed"
-msgstr ""
+msgstr "Plug-in <b>{0}</b> met succes verwijderd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:343
 msgid "Cannot remove builtin plugin"
-msgstr "Ingebouwde plugin kan niet worden verwijderd"
+msgstr "Ingebouwde plug-in kan niet worden verwijderd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:344
 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."
+" Kan niet worden verwijderd. Het is een ingebouwde plug-in. Probeer de plug-"
+"in uit te schakelen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:87
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
-"Hiere kun je het gedrag van calibre instellen door te configureren welke "
-"plugins te gebruiken."
+"Hier kan je het gedrag van calibre instellen door te configureren welke plug-"
+"ins te gebruiken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:90
 msgid "Enable/&Disable plugin"
-msgstr "Activeer/&Deactiveer plugin"
+msgstr "Activeer/&deactiveer plug-in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:91
 msgid "&Customize plugin"
-msgstr "&Persoonlijke instellingen plugin"
+msgstr "&Persoonlijke instellingen plug-in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:92
 msgid "&Remove plugin"
-msgstr "&Verwijder plugin"
+msgstr "&Verwijder plug-in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:93
 msgid "&Add a new plugin"
-msgstr ""
+msgstr "Voeg een nieuwe plug-in toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:33
 msgid "Any custom field"
@@ -12150,13 +12518,15 @@ msgstr "De opzoeknaam van elk eigen veld. Deze namen beginnen met \"#\")"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:57
 msgid "Constant template"
-msgstr ""
+msgstr "Constant sjabloon"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:58
 msgid ""
 "The template contains no {fields}, so all books will have the same name. Is "
 "this OK?"
 msgstr ""
+"Dit sjabloon bevat geen {velden}, en dus zullen alle boeken dezelfde naam "
+"krijgen. Is dat OK?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:47
 msgid "Save &template"
@@ -12170,11 +12540,12 @@ msgid ""
 "particular book does not have some metadata, the variable will be replaced "
 "by the empty string."
 msgstr ""
-"Door het volgende sjabloon aan te passen, kun je beïnvloeden in welke mappen "
-"de bestanden worden opgeslagen en met welke namen. Je kunt het '/' karakter "
-"gebruiken om submappen aan te geven. Beschikbare metagegevens variabelen "
-"worden hieronder beschreven. Als een specifiek boek sommige metagegevens "
-"mist, dan zal de variabele een lege regel bevatten."
+"Door het volgende sjabloon aan te passen, kan je beïnvloeden in welke mappen "
+"de bestanden worden opgeslagen en met welke namen. Je kunt het '/'-karakter "
+"gebruiken om deelmappen aan te geven. Beschikbare variabelen voor "
+"metagegevens worden hieronder beschreven. Als een specifiek boek sommige "
+"metagegevens mist, dan zal de variabele vervangen worden door een lege "
+"string."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:49
 msgid "Available variables:"
@@ -12185,24 +12556,24 @@ msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
 msgstr ""
-"Hier kun je bepalen hoe calibre je boeken zal bewaren wanneer je de bewaar "
-"op schijf knop aanklikt"
+"Hier kan je bepalen hoe calibre je boeken zal bewaren wanneer je de \"bewaar "
+"op schijf\" knop aanklikt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:69
 msgid "Save &cover separately"
-msgstr "Bewaar &Omslag apart"
+msgstr "Bewaar &omslag apart"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:70
 msgid "Replace space with &underscores"
-msgstr "Vervang spatie met &underscores"
+msgstr "Vervang spaties door lage &streepjes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:71
 msgid "Update &metadata in saved copies"
-msgstr "Update &metagegevens in de opgeslagen copieën"
+msgstr "Update &metagegevens in de opgeslagen kopieën"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:72
 msgid "Change paths to &lowercase"
-msgstr "Verander pad in &kleine letters"
+msgstr "Schrijf padnamen met &kleine letters"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:76
@@ -12211,7 +12582,7 @@ msgstr "Formatteer &datum als:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:74
 msgid "File &formats to save:"
-msgstr "Op te slaan bestands &formaten:"
+msgstr "Op te slagen bestands&formaten:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:75
 msgid "Convert non-English characters to &English equivalents"
@@ -12219,7 +12590,7 @@ msgstr "Converteer niet-Engelse tekens naar &Engelse equivalenten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:76
 msgid "Save metadata in &OPF file"
-msgstr "Bewaar metagegevens in &OPF bestand"
+msgstr "Bewaar metagegevens in &OPF-bestand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:33
 msgid ""
@@ -12245,6 +12616,23 @@ msgid ""
 "check for duplicates, to find which column contains a particular item, or to "
 "have hierarchical categories (categories that contain categories)."
 msgstr ""
+"<b>Kolomgroepen</b> zijn zoeknamen die een zoekactie toelaten automatisch in "
+"meer dan een kolom te zoeken. Als je bijvoorbeeld een kolomgroep "
+"<code>allereeksen</code> maakt met de waarde <code>Reeks, #mijnreeks1, "
+"#mijnreeks2</code> dan zal de zoekactie <code>allereeksen:adhoc</code> "
+"zoekterm 'adhoc' zoeken in alledrie de de kolommen <code>Reeks</code>, "
+"<code>#mijnreeks1</code> en <code>#mijnreeks2</code>.<p>Geef de naam van de "
+"kolomgroep in het uitrolvak en de lijst van kolommen in het waardevak, en "
+"klik op de bewaarknop.<p>Opmerking: zoektermen worden naar kleine letters "
+"omgezet.<p> Je kan je kolomgroepen zichtbaar maken in de labelbrowser. Voeg "
+"eenvoudigweg de kolomgroepnamen toe aan het vak 'Maak gebruikerscategorie "
+"van:' waar je meer dan een naam kan opgeven door te scheiden met komma's. De "
+"nieuwe gebruikerscategorie zal automatisch bevolkt worden met alle items in "
+"kolommen uit de kolomgroep.<p> Met het voorbeeld hierboven zal de "
+"automatische categorie alle reeksen vermeld in <code>Reeks</code>,  "
+"<code>#mijnreeks1</code> en <code>#mijnreeks2</code> bevatten. Dit kan "
+"nuttig zijn om duplicaten te ontdekken, om te zien welke kolom een bepaald "
+"item bevat, of om hiïrarchisce categorieïn te maken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:96
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:106
@@ -12253,40 +12641,41 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:119
 msgid "Grouped Search Terms"
-msgstr ""
+msgstr "Kolomgroep"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:97
 msgid "The search term cannot be blank"
-msgstr ""
+msgstr "De zoeknaam mag niet leeg zijn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:107
 msgid "That name is already used for a column or grouped search term"
-msgstr ""
+msgstr "Deze naam wordt al gebruikt voor een kolom of kolomgroep"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:111
 msgid "That name is already used for user category"
-msgstr ""
+msgstr "Deze naam wordt al gebruikt voor een gebruikerscategorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:117
 msgid "The value box cannot be empty"
-msgstr ""
+msgstr "Het waardevak moet ingevuld worden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search.py:129
 msgid "The empty grouped search term cannot be deleted"
-msgstr ""
+msgstr "De lege kolomgroep kan niet verwijderd worden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:110
 msgid "Search as you &type"
-msgstr ""
+msgstr "Zoek terwijl je &typt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:111
 msgid ""
 "&Highlight search results instead of restricting the book list to the results"
 msgstr ""
+"Oplichtende vondsten inplaats van alleen vondsten in de boekenlijst te tonen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:112
 msgid "What to search by default"
-msgstr ""
+msgstr "Standaardzoekruimte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:113
 msgid ""
@@ -12295,14 +12684,18 @@ msgid ""
 "search not just authors but title/tags/series/comments/etc. Use these "
 "options if you would like to change this behavior."
 msgstr ""
+"Als je een zoekterm zonder prefix opgeeft dan doorzoekt calibre normaal alle "
+"metadata. Als je bijvoorbeeld \"Mulisch\" ingeeft zoekt calibre niet alleen "
+"bij auteurs maar ook bij labels, titels en zo voorts. Hier kan je dit gedrag "
+"aanpassen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:114
 msgid "&Limit the searched metadata"
-msgstr ""
+msgstr "&Beperk zoeken tot bepaalde kolommen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:115
 msgid "&Columns that non-prefixed searches are limited to:"
-msgstr ""
+msgstr "Zoek zonder prefix alleen in volgende &kolommen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:116
 msgid ""
@@ -12311,20 +12704,26 @@ msgid ""
 "you always use prefixes in your saved searches. For example, use "
 "\"series:Foundation\" rather than just \"Foundation\" in  a saved search"
 msgstr ""
+"Merk op dat deze optie alle prefixloze zoekopdrachten beïnvloedt, ook "
+"bewaarde zoekopdrachten en restricties. Het is dus best om altijd prefixen "
+"gebruikt bij je bewaarde opdrachten. Gebruik dus bijvoorbeeld "
+"\"series:bouquetreeks\" in plaats van \"bouquetreeks\" in zo'n geval."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:117
 msgid ""
 "Clear search histories from all over calibre. Including the book list, e-"
 "book viewer, fetch news dialog, etc."
 msgstr ""
+"Ruim alle zoekgeschiedenis op, overal in calibre, inclusief de boekenlijst, "
+"het e-boekleesvenster, de nieuwsdialoog, en zo voorts."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:118
 msgid "Clear search &histories"
-msgstr ""
+msgstr "Ruim alle zoekgesc&hiedenis op"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:120
 msgid "&Names:"
-msgstr ""
+msgstr "Namen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:121
 msgid ""
@@ -12334,10 +12733,15 @@ msgid ""
 "changing the name and pressing Save. Change the value of\n"
 "a search term by changing the value box then pressing Save."
 msgstr ""
+"Bevat de namen van alle gekende kolomgroepen. Maak een nieuwe naam\n"
+"aan door hem in het lege vak in te tikken, en klik dan op 'Bewaar'\n"
+"Hernoem door de oude naam te selecteren, deze aan te passen en 'Bewaar'\n"
+"aan te klikken. Verander de waarde van een kolomgroep door het waardevak\n"
+"te veranderen en dan 'Bewaar' te klikken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:126
 msgid "Delete the current search term"
-msgstr ""
+msgstr "Verwijder de huidige kolomgroep"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:128
 msgid ""
@@ -12345,20 +12749,26 @@ msgid ""
 "changing the name then pressing Save. You can change the value\n"
 "of a search term by changing the value box then pressing Save."
 msgstr ""
+"Bewaar de kolomgroep. Je kan een bestaande kolomgroep hernoemen\n"
+"door de oude naam te selecteren, deze aan te passen en 'Bewaar'\n"
+"aan te klikken. Verander de waarde van een kolomgroep door het waardevak\n"
+"te veranderen en dan 'Bewaar' te klikken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:131
 msgid "&Save"
-msgstr ""
+msgstr "Be&waar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:132
 msgid "Make &user categories from:"
-msgstr ""
+msgstr "Maak gebr&uikerscategorie van:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:133
 msgid ""
 "Enter the names of any grouped search terms you wish\n"
 "to be shown as user categories"
 msgstr ""
+"Tik de naam in van de kolomgroepen waarvan je wil dat\n"
+"ze als gebruikerscategorie worden getoond."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:70
@@ -12392,11 +12802,11 @@ msgstr ""
 "<li><b>Handmatig onderhouden</b>: Calibre wijzigt de metagegevens en voegt "
 "collecties alleen toe als een boek is verzonden. Met deze optie zal Calibre "
 "nooit een collectie verwijderen.</li>\n"
-"<li><b>Alleen bij verzenden</b>: Calibre wijzigt de metagegevens en voegt en "
+"<li><b>Alleen bij versturen</b>: Calibre wijzigt de metagegevens en voegt en "
 "verandert collecties alleen wanneer het naar het apparaat wordt "
 "verzonden.</li>\n"
 "</li>Automatisch onderhouden</b> Calibre houdt automatisch de metagegevens "
-"op het apparaat gelijk met de calibre bibliotheek bij elke "
+"op het apparaat gelijk met de calibrebibliotheek bij elke "
 "verbinding.</li></ul>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:77
@@ -12405,10 +12815,10 @@ msgid ""
 "Send to Device button. This setting can be overriden for individual devices "
 "by customizing the device interface plugins in Preferences->Advanced->Plugins"
 msgstr ""
-"Hier kun je instellen hoe calibre je boeken moet bewaren als je Verzend naar "
-"apparaat kiest. Deze instelling kan overschreven worden voor individuele "
-"apparaten door de apparaat interface plugins aan te passen in Voorkeuren-"
-">Geavanceerd->Plugins"
+"Hier kan je instellen hoe calibre je boeken moet bewaren als je 'Verstuur "
+"naar apparaat' kiest. Deze instelling kan overschreven worden voor "
+"individuele apparaten door de apparaatinterfaceplug-ins aan te passen in "
+"Voorkeuren->Geavanceerd->plug-ins"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
@@ -12417,11 +12827,11 @@ msgstr "Content server kon niet worden gestart"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:111
 msgid "Error log:"
-msgstr "Foutmeldigenlogbestand:"
+msgstr "Logbestand met foutmeldigen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:118
 msgid "Access log:"
-msgstr "Toeganglog-bestand:"
+msgstr "Toegangslogbestand:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:133
 msgid "You need to restart the server for changes to take effect"
@@ -12429,39 +12839,39 @@ msgstr "Je moet de server herstarten om de veranderingen door te voeren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:124
 msgid "Server &port:"
-msgstr "Server &poort:"
+msgstr "Server&poort:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:127
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
-"Als je het wachtwoord blank laat, dan kan iedereen je boek collectie zien "
-"via de web interface"
+"Als je het wachtwoord blank laat, dan kan iedereen je boekencollectie zien "
+"via de webinterface"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:128
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
-"De maximum dimensie (BreedtexHoogte) voor weergegeven omslagen. Grotere "
+"De maximale afmetingen (breedte x hoogte) voor weergegeven omslagen. Grotere "
 "omslagen worden in grootte aangepast. "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:129
 msgid "Max. &cover size:"
-msgstr "Max. &Omslag grootte:"
+msgstr "Max. &omslaggrootte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:131
 msgid "Max. &OPDS items per query:"
-msgstr "Max. &OPDS onderdelen per zoekopdracht"
+msgstr "Max. &OPDS-onderdelen per zoekopdracht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:132
 msgid "Max. OPDS &ungrouped items:"
-msgstr "Max. OPDS &ongegroepeerde items:"
+msgstr "Max. &ongegroepeerde items OPDS:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:133
 msgid "Restriction (saved search) to apply:"
-msgstr "Beperking (opgeslagen zoekactie) toe te passen:"
+msgstr "Beperking (opgeslagen zoekactie) om toe te passen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:134
 msgid ""
@@ -12470,7 +12880,7 @@ msgid ""
 "per library (i.e. you can have a different restriction per library)."
 msgstr ""
 "Deze beperking (gebaseerd op een opgeslagen zoekactie) zal de door de "
-"inhoudsserver beschikbare boeken berperken tot die welke overenkoemen met de "
+"inhoudsserver beschikbare boeken beperken tot die welke overenkomen met de "
 "zoekactie. De instelling is per bibliotheek (dat betekent dat men per "
 "bibliotheek een verschillende beperking kan instellen)."
 
@@ -12492,9 +12902,9 @@ msgid ""
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
-"calibre bevat een netwerk server die toestaat om je boek collectie te "
+"calibre bevat een netwerkserver die toestaat om je boekencollectie te "
 "bekijken in een webbrowser van waar dan ook ter wereld. Wijzigingen in de "
-"instellingen hebben pasd effect na het herstarten van de server."
+"instellingen hebben pas effect na het herstarten van de server."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:139
 msgid "Run server &automatically on startup"
@@ -12502,7 +12912,7 @@ msgstr "Start server &automatisch tijdens opstarten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:140
 msgid "View &server logs"
-msgstr "Bekijk &server logs"
+msgstr "Bekijk &serverlogs"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:51
@@ -12516,15 +12926,15 @@ msgid ""
 msgstr ""
 "<p>Denk eraan om calibre te laten draaien, aangezien de server alleen werkt "
 "zo lang calibre actief is.\n"
-"<p>Stanza zou je calibre collectie automatisch moeten zien. Zo niet, probeer "
+"<p>Stanza zou je calibrecollectie automatisch moeten zien. Zo niet, probeer "
 "dan de URL http://myhostname:8080 toe te voegen als een nieuwe catalogus in "
 "de Stanza reader op je iPhone. voor myhostname, gebruik de volledig "
-"gequalificeerde hostname of het IP adres van de computer waar calibre op "
+"gekwalificeerde hostname of het IP adres van de computer waar calibre op "
 "draait."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/social.py:39
 msgid "Downloading social metadata, please wait..."
-msgstr "Download sociale metagegevens, even geduld...."
+msgstr "Downloaden sociale metagegevens, even geduld...."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:23
 msgid ""
@@ -12600,15 +13010,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:154
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:165
 msgid "Template functions"
-msgstr ""
+msgstr "Sjabloonfuncties"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:134
 msgid "You cannot delete a built-in function"
-msgstr ""
+msgstr "Een ingebouwde functie kan niet verwijderd worden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:144
 msgid "Function not defined"
-msgstr ""
+msgstr "Functie niet gedefinieerd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions.py:155
 msgid "Argument count must be -1 or greater than zero"
@@ -12640,15 +13050,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:102
 msgid "&Delete"
-msgstr ""
+msgstr "Verwij&der"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:103
 msgid "&Replace"
-msgstr ""
+msgstr "Ve&rvang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:104
 msgid "C&reate"
-msgstr ""
+msgstr "C&reïer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:105
 msgid "&Program Code: (be sure to follow python indenting rules)"
@@ -12656,7 +13066,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:36
 msgid "Switch between library and device views"
-msgstr "Schakel om tussen bibliotheek en apparaat modus"
+msgstr "Schakel om tussen bibliotheek- en apparaatmodus"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:39
 msgid "Separator"
@@ -12671,30 +13081,34 @@ msgid "The main toolbar"
 msgstr "de hoofdwerkbalk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "De hoofwerkbalk wanneer een apparaat wordt aangekoppeld"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
-msgstr "Het context menu voor de boeken in de Calibre bibliotheek"
+msgstr "Het contextmenu voor de boeken in de calibrebibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
-msgstr "Het context menu voor de boeken op het apparaat"
+msgstr "Het contextmenu voor de boeken op het apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Kan niet toevoegen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Kan acties %s niet op deze plaats toevoegen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Kan niet verwijderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Kan acties %s hier niet verwijderen"
 
@@ -12728,11 +13142,11 @@ msgstr "Verwijder geselecteerde acties van de werkbalk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:113
 msgid "This tweak has it default value"
-msgstr ""
+msgstr "Deze tweak heeft zijn standaardwaarde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:115
 msgid "This tweak has been customized"
-msgstr ""
+msgstr "Dez tweak is veranderd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:236
 msgid ""
@@ -12740,13 +13154,16 @@ msgid ""
 "these tweaks should be available on the website from where you downloaded "
 "the plugins."
 msgstr ""
+"Editeer tweaks voor plug-ins die je geïnstalleerd hebt of voeg ze toe. "
+"Documentatie daarvoor zou je op de website vanwaar de plug-ins komen moeten "
+"kunnen vinden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:277
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:317
 msgid ""
 "There was a syntax error in your tweak. Click the show details button for "
 "details."
-msgstr ""
+msgstr "Syntaxfout in je tweak. Klik op 'toon details'."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:330
 msgid "Invalid tweaks"
@@ -12757,9 +13174,9 @@ msgid ""
 "The tweaks you entered are invalid, try resetting the tweaks to default and "
 "changing them one by one until you find the invalid setting."
 msgstr ""
-"De aanpassingen die u maakt zijn ongeldig. Probeer de aanpassingen te "
-"resetten en deze vervolgens één voor één weer te veranderen tot u de "
-"ongeldige aanpassing vind."
+"De tweaks die je maakt zijn ongeldig. Probeer de aanpassingen te resetten en "
+"deze vervolgens één voor één weer te veranderen tot je de ongeldige "
+"aanpassing vind."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:88
 msgid ""
@@ -12767,34 +13184,37 @@ msgid ""
 "calibre. Your changes will only take effect <b>after a restart</b> of "
 "calibre."
 msgstr ""
+"Waarden van de tweaks worden hieronder getoond. Editeer ze om het gedrag van "
+"calibre te veranderen. Wijzigingen worden van kracht <b>na het "
+"herstarten</b> van calibre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:89
 msgid "Edit tweaks for any custom plugins you have installed"
-msgstr ""
+msgstr "Editeer tweaks voor plug-ins die je geïnstalleerd hebt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:90
 msgid "&Plugin tweaks"
-msgstr ""
+msgstr "&Plug-in tweaks"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:92
 msgid "Edit tweak"
-msgstr ""
+msgstr "Editeer tweak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:93
 msgid "Restore this tweak to its default value"
-msgstr ""
+msgstr "Zet de standaardwaarde terug voor deze tweak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:94
 msgid "Restore &default"
-msgstr ""
+msgstr "Zet de standaardwaarde terug"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:95
 msgid "Apply any changes you made to this tweak"
-msgstr ""
+msgstr "Pas wijzigingen aan deze tweak toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Zoeken"
@@ -12868,7 +13288,7 @@ msgstr "Toetsen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
-msgstr "dubbel klik om aan te passen"
+msgstr "dubbelklik om aan te passen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 msgid "Frame"
@@ -12891,170 +13311,170 @@ msgstr "Klik om te wijzigen"
 msgid "&Alternate shortcut:"
 msgstr "&Alternative snelkoppeling"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
-msgstr ""
+msgstr "Hernoem %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
-msgstr ""
+msgstr "Editeer sorteren voor %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
-msgstr ""
+msgstr "Voeg %s toe aan gebruikerscategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
-msgid "Delete search %s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
-msgid "Remove %s from category %s"
-msgstr ""
+msgstr "Kinderen van %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
-msgid "Search for %s"
-msgstr ""
+msgid "Delete search %s"
+msgstr "Verwijder zoekopdracht %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
-msgid "Search for everything but %s"
-msgstr ""
+msgid "Remove %s from category %s"
+msgstr "Verwijder %s uit categorie %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
+msgid "Search for %s"
+msgstr "Zoek naar %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+msgid "Search for everything but %s"
+msgstr "Zoek naar alles, behalve %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
-msgstr ""
+msgstr "voeg deelcategorie toe aan %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
-msgstr ""
+msgstr "Verwijder categorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Verberg categorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Toon categorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
-msgstr ""
+msgstr "Zoek naar boeken in categorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
-msgstr ""
+msgstr "Zoek naar boeken in niet categorie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Beheer %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Beheer opgeslagen zoekopdrachten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
-msgstr "Beheer gebruikerscategorïen"
+msgstr "Beheer gebruikerscategorieën"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Bekijk alle categorieën"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
-msgstr ""
+msgstr "Verander schema deelcategorieïn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
-msgstr ""
+msgstr "De kolomgroep heet \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 "Het veranderen van auteurs voor deze boeken kan even duren. Weet je het "
 "zeker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Het veranderen van metagegevens voor zoveel boeken kan lang duren. Weet je "
 "het zeker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Zoekopdrachten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
-msgstr ""
+msgstr "Hernoem gebruikerscategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
-msgstr ""
+msgstr "Je mag geen punten gebruiken in de naam van een gebruikerscategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
-msgstr ""
+msgstr "Naam %s is al in gebruik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
-msgstr "Dupliceer naam zoekopdracht"
+msgstr "Al gebruikte naam voor zoekopdracht"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "De opgeslagen zoekopdracht %s is reeds in gebruik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
-msgstr ""
+msgstr "Nieuwe categorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
-msgstr ""
+msgstr "Verwijder gebruikerscategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
-msgstr ""
+msgstr "%s is geen gebruikerscategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
-msgstr ""
+msgstr "%s bevat items. Wil je hem echt verwijderen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
-msgstr ""
+msgstr "Verwijder categorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
-msgstr ""
+msgstr "Gebruikerscategorie %s bestaat niet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
-msgstr ""
+msgstr "Voeg toe aan gebruikerscategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
-msgstr ""
+msgstr "Gebruikerscategorie bestaat %s niet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13063,52 +13483,60 @@ msgid ""
 "*foo will filter all categories at once, showing only those items\n"
 "containing the text \"foo\""
 msgstr ""
+"Zoek naar items. Dit is een \"bevat\"-zoeken; items waarvan de naam de\n"
+"de zoektekst bevat worden gevonden. Je kan zoeken beperken tot bepaalde\n"
+"kolommen met een syntax zoals die van gewoon zoeken. 'tags:foo' "
+"bijvoorbeeld\n"
+"vindt 'foo' in alle labels, maar niet bij auteurs e.d. \"*foo\" ingeven\n"
+"filtert alle categorieïn tegelijk en toont alleen items die de tekst\n"
+"bevatten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
-msgstr ""
+msgstr "V&ind"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
-msgstr ""
+msgstr "Vind eerst/volgende item"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
-msgstr ""
+msgstr "Steek alle categorieïn samen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
+"Geen overeenkomsten meer.</b><p> Klik op 'Vind' om naar de eerste te gaan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Sorteer op naam"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Sorteer op populariteit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Sorteer op gemiddelde score"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Leg de sorteervolgorde vast voor de items in de labelbrowser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
-msgstr "Match alle"
+msgstr "Alle criteria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
-msgstr "Match iedere"
+msgstr "Minstens 1 criterium"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
@@ -13116,17 +13544,17 @@ msgstr ""
 "items die aan alle criteria voldoen, of selecteer items die aan één van deze "
 "criteria voldoen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Beheer &gebruikerscategorieën"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
-msgstr "Voeg je eigen categorïen to aan de labelbrowser"
+msgstr "Voeg je eigen categorïen toe aan de labelbrowser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:65
 msgid "Convert book %(num)d of %(total)d (%(title)s)"
-msgstr ""
+msgstr "Converteer boek %(num)d van %(total)d (%(title)s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
@@ -13139,12 +13567,12 @@ msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
 msgstr ""
-"Kan %d van de %d boeken niet converteren, omdat geen geschikt invoer formaat "
+"Kan %d van de %d boeken niet converteren, omdat geen geschikt invoerformaat "
 "kon worden gevonden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:125
 msgid "Queueing books for bulk conversion"
-msgstr "Boeken in de wachtrij voor massa conversie"
+msgstr "Boeken in de wachtrij voor massaconversie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
 msgid "Queueing "
@@ -13167,7 +13595,7 @@ msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
 msgstr ""
-"De volgende boeken waren al geconverteerd naar %s formaat. Wil je dit "
+"De volgende boeken waren al geconverteerd naar %s-formaat. Wil je dit "
 "nogmaals doen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:188
@@ -13176,7 +13604,7 @@ msgstr "He&rstellen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:190
 msgid "&Donate to support calibre"
-msgstr "Ondersteun calibre met een &Donatie"
+msgstr "Ondersteun calibre met een &donatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194
 msgid "&Eject connected device"
@@ -13184,7 +13612,7 @@ msgstr "Aangesloten apparaat ontkoppelen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:239
 msgid "Calibre Quick Start Guide"
-msgstr "Calibre snelstart handboek"
+msgstr "Calibre snelstarthandboek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305
 msgid "Debug mode"
@@ -13197,24 +13625,23 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
-msgstr "Converteer Fout"
+msgstr "Conversiefout"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Recept uitgeschakeld"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Mislukt</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
-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:577
+msgid "There are active jobs. Are you sure you want to quit?"
+msgstr "Er zijn taken actief. Weet je zeker dat je af wil sluiten?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13223,25 +13650,27 @@ msgstr ""
 " is aan het communiceren met het apparaat!<br>\n"
 "                      Aflsluiten kan schade veroorzaken aan het "
 "apparaat.<br>\n"
-"                      Weet je zeker dat je af wilt sluiten?"
+"                      Weet je zeker dat je af wil sluiten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
-msgstr ""
+msgstr "Actieve taken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
-"Zal blijven draaien in het systeemvak. Om het af te sluiten, kies "
-"<b>Afsluiten</b> in het context menu in het systeemvak."
+"Zal blijven draaien in het systeemvak. Om af te sluiten, kies "
+"<b>Afsluiten</b> in het contextmenu in het systeemvak."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/update.py:53
 msgid ""
 "%s has been updated to version <b>%s</b>. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>."
 msgstr ""
+"%s is geüpdatet naar versie <b>%s</b>. Bekijk de <a href=\"http://calibre-"
+"ebook.com/whats-new\">new features</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/update.py:58
 msgid "Update available!"
@@ -13249,11 +13678,11 @@ msgstr "Update beschikbaar!"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/update.py:63
 msgid "Show this notification for future updates"
-msgstr "Laat deze notificatie zien voor volgende updates"
+msgstr "Laat deze melding zien voor volgende updates"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/update.py:68
 msgid "&Get update"
-msgstr "Verkrij&g update"
+msgstr "&Haal update binnen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
@@ -13305,27 +13734,27 @@ msgstr "Importeer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:178
 msgid "Configure Ebook viewer"
-msgstr "Configureer Eboek viewer"
+msgstr "Configureer e-boekleesvenster"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:179
 msgid "&Font options"
-msgstr "&Lettertype opties"
+msgstr "&Lettertype-opties"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:180
 msgid "Se&rif family:"
-msgstr "&Schreef familie (Serif):"
+msgstr "Lettertype met &schreef:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:181
 msgid "&Sans family:"
-msgstr "Schr&eefloos familie (Sans):"
+msgstr "S&chreefloos lettertype:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:182
 msgid "&Monospace family:"
-msgstr "&Proportionele familie (Monospace):"
+msgstr "&Niet-proportionele familie (Monospace):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:183
 msgid "&Default font size:"
-msgstr "&Standaard letter grootte:"
+msgstr "&Standaard lettergrootte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:186
@@ -13335,11 +13764,11 @@ msgstr " px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:185
 msgid "Monospace &font size:"
-msgstr "Niet-Proportionele &letter grootte:"
+msgstr "Niet-proportionele &lettergrootte:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:187
 msgid "S&tandard font:"
-msgstr "S&tandaard lettertype:"
+msgstr "S&tandaardlettertype:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:188
 msgid "Serif"
@@ -13355,52 +13784,52 @@ msgstr "Niet-proportioneel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:191
 msgid "Remember last used &window size"
-msgstr "Onthoudt de laatst gebruikte venster grootte"
+msgstr "Onthoud de laatst gebruikte venstergrootte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:192
 msgid "Remember the &current page when quitting"
-msgstr ""
+msgstr "Onthoude huidige pagina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:193
 msgid "H&yphenate (break line in the middle of large words)"
-msgstr "Afbreekstreep (Afbreken van regels in het midden van lange woorden)"
+msgstr "Afbreken (Afbreken van regels in het midden van lange woorden)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:194
 msgid ""
 "The default language to use for hyphenation rules. If the book does not "
 "specify a language, this will be used."
 msgstr ""
-"De standaard taal te gebruiken voor de afbreekregels. Als het boek geen taal "
-"specificeerd, dan zal deze worden gebruikt."
+"De standaardtaal voor de afbreekregels. Als het boek geen taal specificeert, "
+"dan zal deze worden gebruikt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:195
 msgid "Default &language for hyphenation:"
-msgstr "Standaard &taal voor regelafbreking"
+msgstr "Standaard&taal voor woordafbreken:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:196
 msgid "&Resize images larger than the viewer window (needs restart)"
 msgstr ""
-"He&rschaal afbeeldingen groter dan het viewer scherm (herstart benodigd)"
+"He&rschaal afbeeldingen groter dan het kijkvenster (herstart benodigd)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:197
 msgid "Page flip &duration:"
-msgstr ""
+msgstr "Pagina omdraaien:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:198
 msgid "disabled"
-msgstr ""
+msgstr "Afgezet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:199
 msgid " secs"
-msgstr ""
+msgstr " seconden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:200
 msgid "Mouse &wheel flips pages"
-msgstr ""
+msgstr "Pagina omdraaien met mius&wiel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:202
 msgid "Maximum &view width:"
-msgstr "Maximale &view breedte"
+msgstr "Maximale &kijkbreedte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:203
 msgid "&General"
@@ -13408,11 +13837,11 @@ msgstr "&Algemeen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:204
 msgid "Double click to change a keyboard shortcut"
-msgstr "Dubbel klik om een keyboard snelkoppeling te veranderen"
+msgstr "Dubbelklik om een sneltoetscombinatie te veranderen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:205
 msgid "&Keyboard shortcuts"
-msgstr "&Keyboard snelkoppeling"
+msgstr "&sneltoetsen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:206
 msgid ""
@@ -13420,10 +13849,13 @@ msgid ""
 "For examples, click <a "
 "href=\"http://www.mobileread.com/forums/showthread.php?t=51500\">here</a>."
 msgstr ""
+"<p>Een CSS-stylesheet die gebruikt kan worden om het uitzichtvan boeken te "
+"bepalen. Voorbeelden vind je <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=51500\">heir</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:207
 msgid "User &Stylesheet"
-msgstr ""
+msgstr "&Stylesheet gebuiker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
@@ -13431,12 +13863,12 @@ msgstr "Geen resultaten gevonden voor:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:40
 msgid "Options to customize the ebook viewer"
-msgstr "Opties om de eboek viewer te verpersoonlijken"
+msgstr "Opties om het e-boekleesvenster te verpersoonlijken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
-msgstr "onthoudt de laatst gebruikte venster grootte"
+msgstr "onthoud de laatst gebruikte venstergrootte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:96
@@ -13444,57 +13876,58 @@ msgid ""
 "Set the user CSS stylesheet. This can be used to customize the look of all "
 "books."
 msgstr ""
-"Definieer de gebruiker CSS stylesheet. Dit kan worden gebruikt om het "
-"uiterlijk van alle boeken te verpersoonlijken"
+"Definieer je eigen CSS-stylesheet. Dit kan worden gebruikt om het uiterlijk "
+"van alle boeken te verpersoonlijken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Maximum width of the viewer window, in pixels."
-msgstr "Maximale breedte van het viewer venster, in pixels."
+msgstr "Maximale breedte van het kijkvenster, in pixels."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Resize images larger than the viewer window to fit inside it"
-msgstr "Herschaal afbeeldingen groter van viewer scherm zodat deze passen"
+msgstr "Herschaal afbeeldingen groter dan het kijkvenster zodat deze passen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:54
 msgid "Hyphenate text"
-msgstr "afbreekstreep in tekst"
+msgstr "tekst afbreken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:56
 msgid "Default language for hyphenation rules"
-msgstr "Standaard taal voor regelafbreek afhandeling"
+msgstr "Standaardtaal voor afhandeling woordafbreken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:58
 msgid "Save the current position in the document, when quitting"
-msgstr ""
+msgstr "Sla de huidige positie in het document op bij verlaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "Have the mouse wheel turn pages"
-msgstr ""
+msgstr "Pagina's omslaan met muiswiel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid ""
 "The time, in seconds, for the page flip animation. Default is half a second."
 msgstr ""
+"Tijd, in seconden, voor paginaomdraaien. Standaard: een halve seconde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:65
 msgid "Font options"
-msgstr "Lettertype Opties"
+msgstr "Opties Lettertype"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:67
 msgid "The serif font family"
-msgstr "De Schreef (Serif) lettertype familie"
+msgstr "lettertypefamilie voor letters met schreef (serif)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:69
 msgid "The sans-serif font family"
-msgstr "De Schreefloze (Sans-Serif) lettertype familie"
+msgstr "lettertypefamilie voor schreefloze letters (sans-serif)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:71
 msgid "The monospaced font family"
-msgstr "De niet-proportionele (monospace) lettertype familie"
+msgstr "lettertypefamilie voor letters met vaste breedte (monospace)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:72
 msgid "The standard font size in px"
-msgstr "De standaard lettergrootte in px"
+msgstr "De standaardlettergrootte in px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:73
 msgid "The monospaced font size in px"
@@ -13502,50 +13935,52 @@ msgstr "De niet-proportionele lettergrootte in px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:74
 msgid "The standard font type"
-msgstr "Het Standaard lettertype"
+msgstr "Het Standaardlettertype"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:125
 msgid "Still editing"
-msgstr ""
+msgstr "Nog aan het editeren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:126
 msgid ""
 "You are in the middle of editing a keyboard shortcut first complete that, by "
 "clicking outside the  shortcut editing box."
 msgstr ""
+"Je bent halverwege de definitie van een sneltoetscombinatie. Vervolledig die "
+"eerst door buiten het definitievakje te klikken."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Zoek in woordenboek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Ga naar..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
-msgstr "Volgende sectie"
+msgstr "Volgende paragraaf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
-msgstr "Vorige sectie"
+msgstr "Vorige paragraaf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Begin van document"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Einde van document"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
-msgstr "Begin van sectie"
+msgstr "Begin van paragraaf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
-msgstr "Einde van sectie"
+msgstr "Einde van paragraaf"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
@@ -13557,19 +13992,19 @@ msgstr "Scroll naar de vorige pagina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
-msgstr "Scroll naar de volgende sectie"
+msgstr "Scroll naar de volgende paragraaf"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
-msgstr "Scroll naar de vorige sectie"
+msgstr "Scroll naar de vorige paragraaf"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
-msgstr "Scroll naar het einde van de sectie"
+msgstr "Scroll naar het einde van de paragraaf"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
-msgstr "Scroll naar het begin van de sectie"
+msgstr "Scroll naar het begin van de paragraaf"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
@@ -13597,7 +14032,7 @@ msgstr "Naar rechts schuiven"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:118
 msgid "Book format"
-msgstr "Boek vorm"
+msgstr "Formaat van boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:198
 msgid "Position in book"
@@ -13606,8 +14041,7 @@ msgstr "Positie in boek"
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
-"Ga naar een referentie. Gebruik referentie modus om referentie nummers te "
-"zien."
+"Ga naar een referentie. Gebruik referentiemodus om referentienummers te zien."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:213
 msgid "Search for text in book"
@@ -13619,79 +14053,79 @@ msgstr "Afdrukvoorbeeld"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:303
 msgid "Clear list of recently opened books"
-msgstr ""
+msgstr "Maak lijst van recent geopende boeken leeg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Verbinden met dict.org om op te zoeken: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
-msgstr "Kies eboek"
+msgstr "Kies e-boek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
-msgstr "Eboeken"
+msgstr "e-boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
-msgstr "Geen zoekterm gevonden voor: %s"
+msgstr "Geen overeenkomst gevonden voor: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Bezig met het laden van de omslagbrowser..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
-msgstr "Opbaren %s"
+msgstr "Opmaken %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Bladwijzer #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Bladwijzer toevoegen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Geef titel voor bladwijzer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Beheer Bladwijzers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
-msgstr "Eboek wordt geladen..."
+msgstr "e-boek wordt geladen..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
-msgstr "EBoek kan niet worden geopend"
+msgstr "e-boek kan niet worden geopend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
-msgstr "Opties voor de eboek viewer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-"Indien gespecificeerd, dan zal het viewer venster proberen naar voren te "
-"komen na het opstarten."
+msgstr "Opties voor het e-boekleesvenster"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+"Indien gespecificeerd, dan zal het boekleesvenster proberen naar voren te "
+"komen na het opstarten."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
-"Als dit is opgegeven zal het leesvenster proberen om volledig scherm te "
-"openen."
+"Als dit is opgegeven zal het boekleesvenster proberen om als volledig scherm "
+"te starten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Print javascript waarschuwingen en console berichten op de console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13699,11 +14133,11 @@ msgid ""
 msgstr ""
 "%prog [opties] bestand\n"
 "\n"
-"Bekijk een eboek.\n"
+"Bekijk een e-boek.\n"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:189
 msgid "E-book Viewer"
-msgstr "E-book lezer"
+msgstr "E-boekleesvenster"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Close dictionary"
@@ -13723,11 +14157,11 @@ msgstr "Vorige pagina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Font size larger"
-msgstr "Lettergrootte groter"
+msgstr "Letters groter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Font size smaller"
-msgstr "Lettergrootte kleiner"
+msgstr "Lettergs kleiner"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Find next"
@@ -13743,7 +14177,7 @@ msgstr "Naar klembord kopiëren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Reference Mode"
-msgstr "Referentie Modus"
+msgstr "Referentiemodus"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Bookmark"
@@ -13751,7 +14185,7 @@ msgstr "Bladwijzer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:209
 msgid "Toggle full screen"
-msgstr "Schakel volledig scherm"
+msgstr "Volledig scherm aan/uit"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:210
 msgid "Print"
@@ -13767,29 +14201,29 @@ msgstr "Zoek vorig item"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
-msgstr "Print eboek"
+msgstr "Print e-boek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
-msgstr "Lettervorm wijzigen"
+msgstr "hoofd/kleine letters veranderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
-msgstr "Lettervorm Wijzigen"
+msgstr "hoofd/kleine letters wisselen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Sleep om de grootte aan te passen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
-msgstr "Weergeven"
+msgstr "Toon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Verberg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Omschakelen"
 
@@ -13798,6 +14232,8 @@ msgid ""
 "Choose you e-book device. If your device is not in the list, choose a \"%s\" "
 "device."
 msgstr ""
+"Kies je leesapparaat. Als het nit in de lijst staat, kies dan een \"%s\"-"
+"apparaat."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:499
 msgid "Moving library..."
@@ -13832,11 +14268,11 @@ msgstr "Selecteer de locatie voor boeken"
 msgid ""
 "You must choose an empty folder for the calibre library. %s is not empty."
 msgstr ""
-"Je moet een lege map kiezen voor de calibre bibliotheek. %s is niet leeg."
+"Je moet een lege map kiezen voor de calibrebibliotheek. %s is niet leeg."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:745
 msgid "welcome wizard"
-msgstr "Welkom Wizard"
+msgstr "Verwelkomingswizard"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:55
@@ -13853,7 +14289,7 @@ msgstr "Welkom bij calibre"
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:48
 msgid "The one stop solution to all your e-book needs."
-msgstr "De complete oplossing voor al je e-boek behoeften."
+msgstr "De complete oplossing voor al je e-boekbehoeften."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:57
 msgid "&Manufacturers"
@@ -13884,7 +14320,7 @@ msgid ""
 "<h2>User Manual</h2>A User Manual is also available <a href=\"http://calibre-"
 "ebook.com/user_manual\">online</a>."
 msgstr ""
-"<h2>Gebruikers Handleiding</h2>Een gebruikers handleiding is ook beschikbaar "
+"<h2>Gebruikershandleiding</h2>Een gebruikershandleiding is ook beschikbaar "
 "<A HREF=\"http://calibre-ebook.com/user_manual\">online</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:49
@@ -13895,15 +14331,16 @@ msgid ""
 "button below. You will also have to register your gmail address in your "
 "Amazon account."
 msgstr ""
-"<p>Calibre kan automatisch boeken via email naar je Kindle versturen. Om dat "
-"te doen, moet je de email instellingen hieronder opgeven. De makkelijkste "
-"manier om dit te doen is een gratis <a href=\"http://gmail.com\">gmail "
-"account</a> aan te vragen, en voor de 'gebruik gmail' optie te kiezen. Je "
-"zult je gmail acccount ook moete registreren in je Amazon account."
+"<p>Calibre kan automatisch boeken via e-mail naar je Kindle versturen. Om "
+"dat te doen, moet je de e-mailinstellingen hieronder opgeven. De "
+"makkelijkste manier om dit te doen is een gratis <a "
+"href=\"http://gmail.com\">gmailaccount</a> aan te vragen, en voor de "
+"'gebruik gmail'-optie te kiezen. Je zult je gmailacccount ook moeten "
+"registreren bij je Amazonaccount."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:50
 msgid "&Kindle email:"
-msgstr "&Kindle email:"
+msgstr "&Kindle e-mail:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:57
 msgid "Choose your &language:"
@@ -13916,7 +14353,7 @@ msgid ""
 msgstr ""
 "<p>Kies een locatie voor je boeken. Als je boeken toevoegt aan calibre "
 "zullen ze hierheen gekopieerd worden. Gebruik een <b>lege map</b> voor een "
-"nieuwe calibre bibliotheek."
+"nieuwe calibrebibliotheek."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:59
 msgid "&Change"
@@ -13928,13 +14365,13 @@ msgid ""
 "location. If a calibre library already exists at the new location, calibre "
 "will switch to using it."
 msgstr ""
-"Als je een bestaande calibre bibliotheek hebt, dan zal deze naar de nieuwe "
-"locatie worden gecopieerd. Als er al een bestaande bibliotheek is in de "
+"Als je een bestaande calibrebibliotheek hebt, dan zal deze naar de nieuwe "
+"locatie worden gekopieerd. Als er al een bestaande bibliotheek is in de "
 "nieuwe locatie, dan zal calibre hier naar overschakelen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:34
 msgid "Using: %s:%s@%s:%s and %s encryption"
-msgstr "Gebruik: %s:%s@%s:%s en %s versleuteling"
+msgstr "Gebruik: %s:%s@%s:%s en %s-versleuteling"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:39
 msgid "Sending..."
@@ -13942,38 +14379,40 @@ msgstr "Bezig met versturen..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:44
 msgid "Mail successfully sent"
-msgstr "Email succesvol"
+msgstr "mailen gelukt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:96
 msgid "OK to proceed?"
-msgstr ""
+msgstr "OK om verder te gaan?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:97
 msgid ""
 "This will display your email password on the screen. Is it OK to proceed?"
-msgstr ""
+msgstr "Dit zal je wachtwoord voor e-mail op het scherm tonen. Is dat OK?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:140
 msgid ""
 "If you are setting up a new hotmail account, you must log in to it  once "
 "before you will be able to send mails."
 msgstr ""
-"Als je een nieuw hotmail account aanmaakt, moet je een keer inloggen voor je "
-"er emails mee kunt verzenden."
+"Als je een nieuw hotmailaccount aanmaakt, moet je èèn keer inloggen voor je "
+"er e-mails mee kunt verzenden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:151
 msgid "Setup sending email using"
-msgstr ""
+msgstr "Instellen van het zenden van mails met gebruik van"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:153
 msgid ""
 "If you don't have an account, you can sign up for a free {name} email "
 "account at <a href=\"http://{url}\">http://{url}</a>. {extra}"
 msgstr ""
+"Als je geen account hebt kan je intekenen op een gratis {name} e-mailaccount "
+"op<a href=\"http://{url}\">http://{url}</a>. {extra}"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:160
 msgid "Your %s &email address:"
-msgstr "Je %s &email adres:"
+msgstr "Je %s &e-mailadres:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:161
 msgid "Your %s &username:"
@@ -13989,9 +14428,9 @@ msgid ""
 "your %s email address to the allowed email addresses in your Amazon.com "
 "Kindle management page."
 msgstr ""
-"Als je email wilt gebruiken om boeken naar je Kindle te zenden, onhou dan "
-"dat je je %s email adres bij de toegestane email adressen moet toevoegen op "
-"de Amazon.com Kindle management pagina."
+"Als je e-mail wilt gebruiken om boeken naar je Kindle te sturen, denk er dan "
+"aan dat je je %s e-mailadres bij de toegestane e-mailadressen moet toevoegen "
+"op de Amazon.com Kindle management pagina."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:187
 msgid "Setup"
@@ -14005,7 +14444,7 @@ msgstr "Ongeldige configuratie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:203
 msgid "You must set the From email address"
-msgstr "Voer het adres van de email zender in"
+msgstr "Voer het adres van de verzender van de mail in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:214
 msgid ""
@@ -14025,27 +14464,27 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
 msgid "Send email &from:"
-msgstr "Verstuur email &van:"
+msgstr "Verstuur e-mail &van:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125
 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>Dit is wat wordt gebruikt in het from: (verzender) veld van emails die "
-"worden verstuurd door calibre.<br> Voer hier je email adres in"
+"<p>Dit is wat wordt gebruikt in het from: (verzender-)veld van e-mails die "
+"worden verstuurd door calibre.<br> Voer hier je e-mailadres in"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid ""
 "<p>A mail server is useful if the service you are sending mail to only "
 "accepts email from well know mail services."
 msgstr ""
-"<p>Een mailserver is handig als de service waar je email naar toe stuurt "
-"alleen email accepteerd van bekende email services."
+"<p>Een mailserver is handig als de service waar je e-mail naartoe stuurt "
+"alleen e-mail accepteert van bekende mail services."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127
 msgid "Mail &Server"
-msgstr "Mail &Server"
+msgstr "Mail&server"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "calibre can <b>optionally</b> use a server to send mail"
@@ -14092,7 +14531,7 @@ msgid ""
 "Use TLS encryption when connecting to the mail server. This is the most "
 "common."
 msgstr ""
-"Gebruik TLS versleuteling voor de verbinding met de mailserver. Dit is de "
+"Gebruik TLS-versleuteling voor de verbinding met de mailserver. Dit is de "
 "meest gebruikelijke."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:140
@@ -14101,7 +14540,7 @@ msgstr "&TLS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:141
 msgid "Use SSL encryption when connecting to the mail server."
-msgstr "Gebruik SSL versleuteling voor de verbinding met de mailserver."
+msgstr "Gebruik SSL-versleuteling voor de verbinding met de mailserver."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:142
 msgid "&SSL"
@@ -14125,7 +14564,7 @@ msgstr "Gebruik Hotmail"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:147
 msgid "&Test email"
-msgstr "&Test email"
+msgstr "&Test e-mail"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:49
 msgid ""
@@ -14134,10 +14573,10 @@ msgid ""
 "directly on the device. To do this you have to turn on the calibre content "
 "server."
 msgstr ""
-"<p>Als je de  <a href=\"http://www.lexcycle.com/download\">Stanza</a> e-boek "
-"applicatie op je iPhone/iTouch gebruikt, dan kun je je calibre boek "
-"collectie direct benaderen vanaf het apparaat. Om dit te kunnen doen zul je "
-"de calibre content server moeten activeren."
+"<p>Als je de <a href=\"http://www.lexcycle.com/download\">Stanza</a> e-"
+"boekapplicatie op je iPhone/iTouch gebruikt, dan kan je je calibre "
+"boekcollectie direct benaderen vanaf het apparaat. Om dit te kunnen doen zul "
+"je de calibre content server moeten activeren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:50
 msgid "Turn on the &content server"
@@ -14179,12 +14618,12 @@ msgstr "gisteren"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:361
 msgid "thismonth"
-msgstr "thismonth"
+msgstr "dezermaand"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:364
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:365
 msgid "daysago"
-msgstr "daysago"
+msgstr "dagengeleden"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:569
 msgid "blank"
@@ -14204,6 +14643,13 @@ msgid ""
 "Default: '%%default'\n"
 "Applies to: CSV, XML output formats"
 msgstr ""
+"De velden die worden weggeschreven als je boeken in de databank catalogeert. "
+"Lijst van velden gescheiden door komma's.\n"
+"Beschikbare velden: %s,\n"
+"plus door jou gemaakte velden.\n"
+"voorbeeld: %s=title,authors,tags\n"
+"Standaard: '%%default'\n"
+"Van toepassing op uitvoer naar CSV en XML"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:65
 msgid ""
@@ -14212,10 +14658,11 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: CSV, XML output formats"
 msgstr ""
-"Uitvoer veld om op te sorteren.\n"
+"Uitvoerveld om op te sorteren.\n"
 "Beschikbare velden: author_sort, id, rating, size, timestamp, title.\n"
 "Standaard: '%default'\n"
-"Betrekking op: CSV, XML uitvoer formaten"
+"Van toepassing op uitvoer naar CSV en XMLVan toepassing op uitvoer naar "
+"BIBTEX"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:232
 msgid ""
@@ -14227,6 +14674,13 @@ msgid ""
 "Default: '%%default'\n"
 "Applies to: BIBTEX output format"
 msgstr ""
+"De velden die worden weggeschreven als je boeken in de databank catalogeert. "
+"Lijst van velden gescheiden door komma's.\n"
+"Beschikbare velden: %s,\n"
+"plus door jou gemaakte velden.\n"
+"voorbeeld: %s=title,authors,tags\n"
+"Standaard: '%%default'\n"
+"Van toepassing op uitvoer naar BIBTEX"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:245
 msgid ""
@@ -14235,10 +14689,10 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: BIBTEX output format"
 msgstr ""
-"Weergave veld om op te sorteren.\n"
+"Weergaveveld om op te sorteren.\n"
 "Beschikbare velden: author_sort, id, rating, size, timestamp, title.\n"
 "Standaard: '%default'\n"
-"Van toepassing voor: BIBTEX weergave formaat"
+"Van toepassing op uitvoer naar BIBTEX"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:254
 msgid ""
@@ -14247,10 +14701,10 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: BIBTEX output format"
 msgstr ""
-"Maak een citaat voor BIBTEX ingaves.\n"
+"Maak een citaatlabel voor BIBTEX-ingaves.\n"
 "Boolean waarde : True, False\n"
 "Standaard: '%default'\n"
-"Van toepassing voor: BIBTEX weergave formaat"
+"Van toepassing op uitvoer naar BIBTEX"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:263
 msgid ""
@@ -14259,6 +14713,10 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: BIBTEX output format"
 msgstr ""
+"Maak een veld voor bestanden als 'formats' geselecteerd is als veld\n"
+"Boolean waarde : True, False\n"
+"Standaard: '%default'\n"
+"Van toepassing op uitvoer naar BIBTEX"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:272
 msgid ""
@@ -14276,7 +14734,7 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: BIBTEX output format"
 msgstr ""
-"BibTeX bestandscodering weergave.\n"
+"BibTeX-bestandscodering weergave.\n"
 "Beschikbare types: utf8, cp1252, ascii.\n"
 "Standaard: '%default'\n"
 "Van toepassing op: BIBTEX weergave formaat"
@@ -14288,7 +14746,7 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: BIBTEX output format"
 msgstr ""
-"BibTeX bestandscodering vlag.\n"
+"BibTeX-bestandscodering vlag.\n"
 "Beschikbare types: strict, replace, ignore, backslashreplace.\n"
 "Standaard: '%default'\n"
 "Van toepassing op: BIBTEX weergave formaat"
@@ -14300,7 +14758,7 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: BIBTEX output format"
 msgstr ""
-"Soort item voor Bibtex catalogus.\n"
+"Soort item voor Bibtexcatalogus.\n"
 "Beschikbare soorten: book, misc, mixed\n"
 "Standaard: '%default'\n"
 "Van toepassing op: BIBTEX weergave formaat"
@@ -14314,7 +14772,7 @@ msgstr ""
 "De titel van de aangemaakte catalogus wordt ook gebruikt als titel in de "
 "metagegevens.\n"
 "Standaard: '%default'\n"
-"Betrekking tot: ePub, MOBI uitvoer formaten"
+"Betrekking tot: ePub, MOBI uitvoerformaten"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:614
 msgid ""
@@ -14341,7 +14799,7 @@ msgid ""
 msgstr ""
 "Regex die de labels beschijft die worden uitgesloten als genres.\n"
 "Standaard: '%default'  uitgezonderd labels in haken, b.v. '[<label>]'\n"
-"Betrekking tot: ePub, MOBI uitvoer formaten"
+"Betrekking tot: ePub, MOBI uitvoerformaten"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:637
 msgid ""
@@ -14388,7 +14846,7 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
-"Bewaar 'Series' onderdeel in catalogus.\n"
+"Bewaar 'Reeks' onderdeel in catalogus.\n"
 "Standaard: '%default'\n"
 "Geldt voor: ePub, MOBI uitvoerformaten."
 
@@ -14431,9 +14889,9 @@ msgstr ""
 "Specifieer het uitvoer profiel. In sommige gevallen is een uitvoer profiel "
 "noodzakelijk om de catalogus te optimalizeren voor het apparaat. "
 "Bijvoorbeeld, 'kindle' of 'kindle_dx' maakt een gestructureerde "
-"inhoudsopgave aan met secties en artikelen.\n"
+"inhoudsopgave aan met paragraafs en artikelen.\n"
 "Standaard: '%default'\n"
-"Betrekking tot: ePub, MOBI uitvoer formaten"
+"Betrekking tot: ePub, MOBI uitvoerformaten"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:711
 msgid ""
@@ -14520,7 +14978,7 @@ msgstr "Extra auteurs"
 
 #: /home/kovid/work/calibre/src/calibre/library/check_library.py:30
 msgid "Missing book formats"
-msgstr "Missende boekformaten"
+msgstr "Ontbrekende boekformaten"
 
 #: /home/kovid/work/calibre/src/calibre/library/check_library.py:31
 msgid "Extra book formats"
@@ -14532,22 +14990,22 @@ msgstr "Onbekende bestanden in de boeken"
 
 #: /home/kovid/work/calibre/src/calibre/library/check_library.py:33
 msgid "Missing covers files"
-msgstr ""
+msgstr "Ontbrekende omslagen"
 
 #: /home/kovid/work/calibre/src/calibre/library/check_library.py:34
 msgid "Cover files not in database"
-msgstr ""
+msgstr "Omslagen ontbreken in databank"
 
 #: /home/kovid/work/calibre/src/calibre/library/check_library.py:35
 msgid "Folders raising exception"
-msgstr "Mappen die een uitzondering hebben"
+msgstr "Mappen die een uitzondering opwerpen"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:44
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
-"Pad naar de Calibre Bibliotheek. Standaard word het pad gebruikt dat is "
+"Pad naar de calibrebibliotheek. Standaard word het pad gebruikt dat is "
 "opgeslagen in de instellingen."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:123
@@ -14572,7 +15030,7 @@ msgstr ""
 "is een lijst met waarden die met komma's van elkaar zijn gescheiden.\n"
 "Beschikbare velden: %s\n"
 "Standaard: %%default. Het speciale veld 'all' kan worden gebruikt om alle "
-"velden te selecteren. Heeft alleen een resultaat in text uitvoer formaat."
+"velden te selecteren. Heeft alleen een resultaat in txt-uitvoerformaat."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:138
 msgid ""
@@ -14594,9 +15052,9 @@ msgid ""
 "please see the search related documentation in the User Manual. Default is "
 "to do no filtering."
 msgstr ""
-"filter de resultaten op de zoek term. Voor het formaat van de zoek term, "
-"kijk naar de zoek-gerelateerde documentatie in de gebruikershandleiding. "
-"Standaard word er niet gefilterd."
+"Filter de resultaten op de zoekoperatie. Voor het formaat van de "
+"zoekoperatie, kijk naar de zoek-gerelateerde documentatie in de "
+"gebruikershandleiding. Standaard word er niet gefilterd."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:144
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1043
@@ -14604,7 +15062,7 @@ msgid ""
 "The maximum width of a single line in the output. Defaults to detecting "
 "screen size."
 msgstr ""
-"De maximale breedte van een enkele regel in de uitvoer. Standaardis dit "
+"De maximale breedte van een enkele regel in de uitvoer. Standaard is dit "
 "hetzelfde als de schermgrootte."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:145
@@ -14617,8 +15075,8 @@ msgid ""
 "The prefix for all file paths. Default is the absolute path to the library "
 "folder."
 msgstr ""
-"De prefix voor folder paden. Standaard is het absolute pad naar de "
-"bibliotheek folder."
+"De prefix voor mappaden. Standaard is het absolute pad naar de "
+"bibliotheekmap."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:168
 msgid "Invalid fields. Available fields:"
@@ -14626,7 +15084,7 @@ msgstr "Ongeldig veld. Beschikbare velden:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:175
 msgid "Invalid sort field. Available fields:"
-msgstr "Ongeldig sorteer veld. Beschikbare velden:"
+msgstr "Ongeldig sorteerveld. Beschikbare velden:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:247
 msgid ""
@@ -14634,7 +15092,7 @@ msgid ""
 "(see --duplicates option):"
 msgstr ""
 "De volgende boeken zijn niet toegevoegd omdat ze al bestaan in de database. "
-"(Zie de --duplicates optie):"
+"(Zie de --duplicates-optie):"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:271
 msgid ""
@@ -14648,20 +15106,19 @@ msgstr ""
 "\n"
 "Voeg de opgegeven bestanden toe als boeken in de database. Mappen kunnen ook "
 "worden\n"
-"opgegeven, zie de map gerelateerde opties hier onder.\n"
+"opgegeven, zie de opties over mappen hieronder.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:280
 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 ""
-"Neem aan dat iedere folder slechts een enkel logisch boek bevat, en dat alle "
-"bestanden in de folder verschillende bestandsformaten zin voor dat enkele "
-"boek."
+"Neem aan dat iedere map slechts een enkel logisch boek bevat, en dat alle "
+"bestanden in de map verschillende bestandsformaten zijn voor dat enkele boek."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:282
 msgid "Process directories recursively"
-msgstr "Bewerk mappen recursief"
+msgstr "Verwerk mappen recursief"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:284
 msgid ""
@@ -14669,7 +15126,7 @@ msgid ""
 "on book titles."
 msgstr ""
 "Voeg boeken toe aan de database zelfs als deze al bestaan. Vergelijking is "
-"gebaseerd op de boek titels."
+"gebaseerd op de boektitels."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:286
 msgid "Add an empty book (a book with no formats)"
@@ -14686,7 +15143,7 @@ msgstr "Leg de auteur van het toegevoegde lege boek vast"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:292
 msgid "Set the ISBN of the added empty book"
-msgstr "Leg de ISBN code van het toegevoegde lege boek vast"
+msgstr "Leg de ISBN-code van het toegevoegde lege boek vast"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:318
 msgid "You must specify at least one file to add"
@@ -14702,9 +15159,9 @@ msgid ""
 msgstr ""
 "%prog remove ids\n"
 "\n"
-"Verwijder de boeken die zijn geïdentificeerd als id's van de database. id's "
-"moeten staan in een kommagescheiden lijst. (id nummers kan men krijgen door "
-"de opsommingsopdracht te gebruiken). Bv. 23,34,57-85\n"
+"Verwijder de boeken die zijn opgegeven met hun id's in de database. id's "
+"moeten staan in een kommagescheiden lijst. (id's kan men krijgen door het "
+"commando list te gebruiken). Bv. 23,34,57-85\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:350
 msgid "You must specify at least one book to remove"
@@ -14718,19 +15175,19 @@ msgid ""
 "identified by id. You can get id by using the list command. If the format "
 "already exists, it is replaced.\n"
 msgstr ""
-"%prog aa_format [opties] id eboek_bestand\n"
+"%prog aa_format [opties] id e-boek_bestand\n"
 "\n"
-"Voeg het eboek in eboek_file toe aan de beschikbare formaten voor het "
-"logische boek geïdentificeerd door id. Je kan id nummers krijgen met de "
-"opsommingsopdracht. Als het formaat al bestaat, wordt het vervangen.\n"
+"Voeg het e-boek in e-boek_bestand toe aan de beschikbare formaten voor het "
+"logische boek geïdentificeerd door id. Je kan id's krijgen met het commando "
+"list. Als het formaat al bestaat, wordt het vervangen.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:384
 msgid "You must specify an id and an ebook file"
-msgstr "zowel een id als een eboek bestand moeten worden gespecificeerd"
+msgstr "zowel een id als een e-boekbestand moeten worden gespecificeerd"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:389
 msgid "ebook file must have an extension"
-msgstr "eboek bestand heeft een extensie nodig"
+msgstr "e-boekbestand heeft een extensie nodig"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:397
 msgid ""
@@ -14745,7 +15202,7 @@ msgstr ""
 "%prog remove_format [opties] id fmt\n"
 "\n"
 "Verwijder het formaat fmt van het logische boek geïdentificeerd door id. Je "
-"kunt de id verkrijgen door het list commando te gebruiken. fmt is een "
+"kunt de id verkrijgen door het commando list te gebruiken. fmt is een "
 "bestands extensie zoals LRF, TXT of EPUB. Als het logische boek niet in dit "
 "formaat bestaat, dan zal er niets gebeuren.\n"
 
@@ -14767,11 +15224,11 @@ msgstr ""
 "\n"
 "Geef de metagegevens weer die zijn opgeslagen in de Calibre database voor "
 "het boek dat word geïdentificeerd door id.\n"
-"id is een id nummer uit de opsommingsopdracht.\n"
+"id is een nummer verkregen met het commando list.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:440
 msgid "Print metadata in OPF form (XML)"
-msgstr "Print metagegevens in OPF formaat (XML)"
+msgstr "Print metagegevens in OPF-formaat (XML)"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:449
 msgid "You must specify an id"
@@ -14792,17 +15249,16 @@ msgstr ""
 "\n"
 "%prog set_metadata [opties] if /pad/naar/metadata.opf\n"
 "\n"
-"Geef de metagegevens weer diezijn opgeslagen in de Calibre database voor het "
+"Geef de metagegevens weer die zijn opgeslagen in de calibredatabase voor het "
 "boek dat word geïdentificeerd door id\n"
-" uit het OPF bestand metadata.opf. id is een id nummer uit het lijst "
-"commando.\n"
-"Je kunt een kort overzicht voor het OPF formaat krijgen door de --as-opf "
-"schakel te\n"
-"gebruiken met het show_metadata commando.\n"
+" uit het OPF-bestand metadata.opf. id is een nummer uit het commando list.\n"
+"Je kunt een kort overzicht voor het OPF-formaat krijgen door de --as-opf "
+"optie te\n"
+"gebruiken met het commando show_metadata.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:480
 msgid "You must specify an id and a metadata file"
-msgstr "Je moet een id en metagegevens bestand opgeven"
+msgstr "Je moet een id en bestand met metagegevens opgeven"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:500
 msgid ""
@@ -14818,29 +15274,29 @@ msgstr ""
 "\n"
 "Exporteer de boeken gespecificeerd door ids (een lijst gescheiden door "
 "komma's) naar het bestandssysteem.\n"
-"De export operatie bewaard alle formaten van het boek, de omslag en "
-"metagegevens (in een opf bestand). \n"
-"Je kunt ID nummers verkrijgen door middel van de opsommingsopdracht.\n"
+"De exportoperatie bewaard alle formaten van het boek, de omslag en "
+"metagegevens (in een opf-bestand). \n"
+"Je kunt id-nummers verkrijgen door middel van het commando list.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:508
 msgid "Export all books in database, ignoring the list of ids."
-msgstr "Exporteer alle boeken in de database, negeer de lijst met ids."
+msgstr "Exporteer alle boeken in de database, negeer de lijst met id's."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:510
 msgid "Export books to the specified directory. Default is"
-msgstr "Exporteer boeken naar de opgegeven folder. Standaard is"
+msgstr "Exporteer boeken naar de opgegeven map. Standaard is"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:512
 msgid "Export all books into a single directory"
-msgstr "exporteer alle boeken naar een enkele folder"
+msgstr "exporteer alle boeken naar een enkele map"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:519
 msgid "Specifying this switch will turn this behavior off."
-msgstr "Opgeven van deze schakelaar deactiveert deze functie."
+msgstr "Opgeven van deze optie deactiveert deze functie."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:542
 msgid "You must specify some ids or the %s option"
-msgstr "Je moet ids opgeven of de %s optie gebruiken"
+msgstr "Je moet id's opgeven of de %s-optie gebruiken"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:555
 msgid ""
@@ -14855,7 +15311,7 @@ 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 "
+"de computer wordt gebruikt. Dit label mag geen spaties of dubbelepunten "
 "bevatten: name is de aan de menselijke taal aangepaste naam van de kolom.\n"
 "datatype is één van: {0}\n"
 
@@ -14864,8 +15320,8 @@ msgid ""
 "This column stores tag like data (i.e. multiple comma separated values). "
 "Only applies if datatype is text."
 msgstr ""
-"Deze kolom slaat labels op in de vorm van data (vb. waarden gescheiden door "
-"comma's). Geldt enkel als het datatype tekst is."
+"Deze kolom slaat labelachtige info  (waarden gescheiden door komma's) op. "
+"Kan enkel als het datatype tekst is."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:568
 msgid ""
@@ -14873,6 +15329,10 @@ msgid ""
 "interpreted. This is a JSON  string. For enumeration columns, use --"
 "display='{\"enum_values\":[\"val1\", \"val2\"]}'"
 msgstr ""
+"Een woordenboek met opties om de interpretatie van de gegevens in deze kolom "
+"te configureren Dit is een string in het JSON-formaat. Voor kolommen met "
+"lijst van toegestane waarden gebruik je --"
+"display='{\"enum_values\":[\"val1\", \"val2\"]}'"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:582
 msgid "You must specify label, name and datatype"
@@ -14888,6 +15348,13 @@ msgid ""
 "ouput.\n"
 "    "
 msgstr ""
+"\n"
+"    %prog catalog /pad/naar/bestemming.(CSV|EPUB|MOBI|XML ...) [opties]\n"
+"\n"
+"    Exporteer een catalogus in een formaat aangegeven door de extensie na\n"
+"/pad/naar/bestemming. Opties bepalen hoe de records eruitzien in de\n"
+"catalogus.\n"
+"    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:657
 msgid ""
@@ -14905,20 +15372,20 @@ msgid ""
 "please see the search-related documentation in the User Manual.\n"
 "Default: no filtering"
 msgstr ""
-"Filter de resultaten bij de zoekopdracht. voor het formaat van de "
-"zoekopdracht,  zie de zoek functionaliteit in de gebruikers handleiding.\n"
+"Filter de resultaten met de zoekopdracht. Voor het formaat van de "
+"zoekopdracht,  zie de zoekfunctionaliteit in de gebruikershandleiding.\n"
 "Standaard: Geen filter"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:667
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:499
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
-"Laat gedetailleerde output informatie zien. Handig bij het opsporen van "
+"Laat gedetailleerde outputinformatie zien. Handig bij het opsporen van "
 "problemen."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:680
 msgid "Error: You must specify a catalog output file"
-msgstr "Fout: Je moet een catalogus uitvoer bestand opgeven"
+msgstr "Fout: Je moet een uitvoerbestand voor de catalogus opgeven"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:726
 msgid ""
@@ -14936,10 +15403,9 @@ msgstr ""
 "\n"
 "    Stel de waarde in van een gepersonaliseerde kolom voor het boek "
 "geïdentificeerd door de identificatie.\n"
-"    Je kan een lijst van identificaties krijgen via de list opdracht.\n"
-"    Je kan een lijst van gepersonaliseerde kolom namen krijgen door gebruik "
-"van de custom_columns\n"
-"    opdracht.\n"
+"    Je kan een lijst van identificaties krijgen via de opdracht list.\n"
+"    Je kan een lijst van gepersonaliseerdekolomnamen krijgen door gebruik\n"
+"     van de opdracht custom_columns.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:737
@@ -14947,7 +15413,7 @@ msgid ""
 "If the column stores multiple values, append the specified values to the "
 "existing ones, instead of replacing them."
 msgstr ""
-"Als de kolom meerdere gegevens bevat, voeg dan de gespecificeerde waardes "
+"Als de kolom meervoudige gegevens bevat, voeg dan de gespecificeerde waarden "
 "toe aan de bestaande, in plaats van ze te vervangen."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:748
@@ -14966,7 +15432,7 @@ msgstr ""
 "    %prog custom_columns [options]\n"
 "\n"
 "    Maak een lijst van alle beschikbare gepersonaliseerde kolommen. Toon "
-"kolom labels en identificaties.\n"
+"kolomlabels en identificaties.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:774
@@ -14994,8 +15460,8 @@ msgstr ""
 "\n"
 "    %prog remove_custom_column [options] label\n"
 "\n"
-"    Verwijder de gepersonaliseerde kolom geïdentificeerd via het label. Je "
-"kan beschikbare\n"
+"    Verwijder de gepersonaliseerde kolom aangeduid door label. Je kan "
+"beschikbare\n"
 "    kolommen zien via de opdracht custom_columns.\n"
 "    "
 
@@ -15023,9 +15489,9 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    %prog saved_searches [options] opsommen\n"
-"    %prog saved_searches naam zoekactie toevoegen\n"
-"    %prog saved_searches naam verwijderen\n"
+"    %prog saved_searches [opties] list\n"
+"    %prog saved_searches add naam_zoekactie\n"
+"    %prog saved_searches remove naam\n"
 "\n"
 "    Beheer de opgeslagen zoekacties opgeslagen in deze database.\n"
 "    Als een query wordt toegevoegd met een bestaande naam,\n"
@@ -15034,7 +15500,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:840
 msgid "Error: You must specify an action (add|remove|list)"
-msgstr "Fout: U moet een actie opgeven (toevoegen|verwijderen|opsommen)"
+msgstr "Fout: je moet een actie opgeven   (add|remove|list)"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:848
 msgid "Name:"
@@ -15054,7 +15520,7 @@ msgstr "toegevoegd"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:863
 msgid "Error: You must specify a name"
-msgstr "Fout: U moet een naam opgeven"
+msgstr "Fout: je moet een naam opgeven"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:866
 msgid "removed"
@@ -15064,7 +15530,7 @@ msgstr "verwijderd"
 msgid "Error: Action %s not recognized, must be one of: (add|remove|list)"
 msgstr ""
 "Fout: Actie %s wordt niet herkend, het moet een van deze zijn : "
-"(toevoegen|verwijderen|opsommen)"
+"(add|remove|list)"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:878
 msgid ""
@@ -15127,17 +15593,17 @@ msgid ""
 msgstr ""
 "%prog restore_database [options]\n"
 "\n"
-"Herstel deze database met de metagegevens die opgeslagen zijn in de OPF "
+"Herstel deze database met de metagegevens die opgeslagen zijn in de OPF-"
 "bestanden\n"
-"in elke map van de bibliotheek. Dit is handig als je metadata.db bestand "
+"in elke map van de bibliotheek. Dit is handig als je metadata.db-bestand "
 "corrupt is.\n"
 "\n"
 "WAARSCHUWING: Dit zal je database compleet herbouwen. Je raakt alle\n"
-"bewaarde zoektermen, gebruikerscategorieën, pluginsets, "
+"bewaarde zoektermen, gebruikerscategorieën, plug-insets, "
 "conversieinstellingen\n"
-"en recepten kwijt. Herstelde metagegevens zullen net zo accuraat zijn als "
+"en recepten kwijt. Herstelde metagegevens zullen maar zo accuraat zijn als "
 "wat er\n"
-"gevonden is in de OPF bestanden.\n"
+"gevonden is in de OPF-bestanden.\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:974
@@ -15145,11 +15611,12 @@ msgid ""
 "Really do the recovery. The command will not run unless this option is "
 "specified."
 msgstr ""
-"Het herstel echt doen. Dit zal niet starten totdat deze optie is ingesteld."
+"Het herstel echt uitvoeren. Dit zal niet starten tenzij deze optie is "
+"ingesteld."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:987
 msgid "You must provide the %s option to do a recovery"
-msgstr ""
+msgstr "Je moet de %s-optie aangeven om herstel uit te voeren."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1024
 msgid ""
@@ -15160,42 +15627,42 @@ msgid ""
 msgstr ""
 "%prog list_categories [options]\n"
 "\n"
-"Maak een rapport van de categorie informatie in de database. De\n"
-"informatie is gelijk aan wat er in het tagpanel staat.\n"
+"Maak een rapport van de categorie-informatie in de database. De\n"
+"informatie is gelijk aan wat er in het labelpaneel staat.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1032
 msgid ""
 "Output only the number of items in a category instead of the counts per item "
 "within the category"
 msgstr ""
-"Toon alleen het aantal items binnen een categorie in plaats van de het "
-"aantal stukken per item binnen in de categorie"
+"Toon alleen het aantal items in een categorie in plaats van de aantallen per "
+"item binnen in de categorie"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1037
 msgid ""
 "The character to put around the category value in CSV mode. Default is "
 "quotes (\")."
 msgstr ""
-"Het karakter dat om de categorie waarde moet in CSV modus. Standaard is "
-"quotes ('')."
+"Het karakter dat om de categoriewaarde moet in CSV-modus. Standaard is dit "
+"het aanhalingsteken (\")."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1040
 msgid ""
 "Comma-separated list of category lookup names.\n"
 "Default: all"
 msgstr ""
-"Kommagescheiden lijst van categorie opzoeknamen.\n"
+"Kommagescheiden lijst van categorie-opzoeknamen.\n"
 "Standaard: alle"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1046
 msgid "The string used to separate fields in CSV mode. Default is a comma."
 msgstr ""
-"Het karakter dat gebruitk wordt om velden te scheiden in CSV mode. Standaard "
-"is komma."
+"Het karakter dat gebruikt wordt om velden te scheiden in CSV-modus. "
+"Standaard is dit een komma."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1084
 msgid "CATEGORY ITEMS"
-msgstr "Categorie items"
+msgstr "Categorie-items"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:1153
 msgid ""
@@ -15210,24 +15677,24 @@ msgid ""
 msgstr ""
 "%%prof command [opties] [argumenten]\n"
 "\n"
-"%%prog is de command line interface voor de Calibre boek database.\n"
+"%%prog is de command line interface voor de boekdatabase van Calibre.\n"
 "\n"
 "commando is een van de volgende:\n"
 "  %s\n"
 "\n"
 "Voor help met een specifiek commando: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Er is geen label opgegeven"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
 msgstr ""
-"Het label mag alleen bestaan uit kleine letters, cijfers en underscores, en "
-"moet beginnen met een letter."
+"Het label mag alleen bestaan uit kleine letters, cijfers en ulage streepjes "
+"en moet beginnen met een letter."
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:66
 msgid "%sAverage rating is %3.1f"
@@ -15237,15 +15704,15 @@ msgstr "%sGemiddelde waardering is %3.1f"
 msgid "Main"
 msgstr "Algemeen"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
-msgstr "<p>Migreer oude database naar eboek bibliotheek in %s<br><center>"
+msgstr "<p>Migreer oude database naar e-boekbibliotheek in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopiëren van <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Comprimeren database"
 
@@ -15267,7 +15734,7 @@ msgstr "Verwerkt"
 
 #: /home/kovid/work/calibre/src/calibre/library/restore.py:192
 msgid "creating custom column "
-msgstr "Maak custom column "
+msgstr "Maak zelf een kolom "
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:32
 msgid "The title"
@@ -15282,7 +15749,7 @@ msgid ""
 "The author sort string. To use only the first letter of the name use "
 "{author_sort[0]}"
 msgstr ""
-"De auteur sorteer sleutel. Gebruik {author_sort[0]} om alleen de eerste "
+"De sleutel sorteerauteur. Gebruik {author_sort[0]} om alleen de eerste "
 "letter van de naam te gebruiken"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
@@ -15291,15 +15758,15 @@ msgstr "De labels"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The series"
-msgstr "De serie"
+msgstr "De reeks"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid ""
 "The series number. To get leading zeros use {series_index:0>3s} or "
 "{series_index:>3s} for leading spaces"
 msgstr ""
-"Het serienummer. Om deze vooraf te laten gaan door nullen of spaties, "
-"gebruik {series_index:0>3s} or respectievelijk {series_index:>3s}"
+"Het reeksnummer. Om dit vooraf te laten gaan door nullen of spaties, gebruik "
+"{series_index:0>3s} or respectievelijk {series_index:>3s}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:41
 msgid "The rating"
@@ -15319,11 +15786,11 @@ msgstr "De datum"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:45
 msgid "The published date"
-msgstr "De publicatie datum"
+msgstr "De publicatiedatum"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:46
 msgid "The calibre internal id"
-msgstr "Het calibre interne id"
+msgstr "Het interne id voor calibre"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:56
 msgid "Options to control saving to disk"
@@ -15335,7 +15802,7 @@ msgid ""
 "in the calibre library. Makes saving to disk slower."
 msgstr ""
 "Normaal gesproken, zal calibre de metagegevens in opgeslagen bestanden "
-"updaten aan de hand van de informatie in de calibre bibliotheek. Dit maakt "
+"updaten aan de hand van de informatie in de calibrebibliotheek. Dit maakt "
 "opslaan op disk langzamer."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:65
@@ -15343,16 +15810,16 @@ msgid ""
 "Normally, calibre will write the metadata into a separate OPF file along "
 "with the actual e-book files."
 msgstr ""
-"Normaal gesproken, zal calibre de metagegevens opslaan in een apart OPF "
-"bestand samen met de daadwerkelijke e-boek bestanden."
+"Normaal gesproken, zal calibre de metagegevens opslaan in een apart OPF-"
+"bestand samen met de daadwerkelijke e-boekbestanden."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:68
 msgid ""
 "Normally, calibre will save the cover in a separate file along with the "
 "actual e-book file(s)."
 msgstr ""
-"Normaal gesproken zal calibre de omslag afbeelding opslaan in een apart "
-"bestand, samen met de daadwerkelijke e-boek bestanden."
+"Normaal gesproken zal calibre de omslagafbeelding opslaan in een apart "
+"bestand, samen met de daadwerkelijke e-boekbestanden."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:71
 msgid ""
@@ -15370,7 +15837,7 @@ msgid ""
 "are: {%s}"
 msgstr ""
 "Het sjabloon dat de bestandsnaam en mapstructuur bepaalt voor de opgeslagen "
-"bestanden. Standaard is  \"%s\", en dit slaat boeken op in per-auteur mappen "
+"bestanden. Standaard is  \"%s\", en dit slaat boeken op in mappen per auteur "
 "met daarin bestandsnamen met de titel en auteur. Beschikbare opties zijn: "
 "{%s}"
 
@@ -15383,7 +15850,7 @@ msgid ""
 msgstr ""
 "Het sjabloon om de bestands- en mapnamen te definiëren van de bestanden die "
 "naar het apparaat worden gestuurd. Standaard is \"%s\", wat boeken opslaat "
-"in folders per auteur, met bestandsnamen die zowel de titel an auteur "
+"in mappen per auteur, met bestandsnamen die zowel de titel als de auteur "
 "bevatten. Beschikbare instellingen zijn: {%s}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:86
@@ -15395,7 +15862,7 @@ msgid ""
 msgstr ""
 "Normaal gesproken zal calibre alle niet-Engelse karakters automatisch in de "
 "Engelse equivalenten converteren voor bestandsnamen. WAARSCHUWING: als je "
-"dit uitschakelt dan kun je fouten krijgen tijdens het opslaan, afhankelijk "
+"dit uitschakelt dan kan je fouten krijgen tijdens het opslaan, afhankelijk "
 "van hoe goed je bestandssysteem unicode ondersteund."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:92
@@ -15404,16 +15871,16 @@ msgid ""
 "The format in which to display dates. %d - day, %b - month, %Y - year. "
 "Default is: %b, %Y"
 msgstr ""
-"Het formaat voor de datum weergave. %d - dag. %b - maand. %Y - jaar. "
+"Het formaat voor de datumweergave. %d - dag. %b - maand. %Y - jaar. "
 "Standaard: %b, %Y"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:98
 msgid "Convert paths to lowercase."
-msgstr "Converteer mappen naar kleine letters."
+msgstr "Converteer mapnamen naar kleine letters."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:100
 msgid "Replace whitespace with underscores."
-msgstr "Vervang witruimte met underscores"
+msgstr "Vervang witruimte met lage sreepjes (_)"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:357
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:381
@@ -15430,12 +15897,11 @@ msgstr "De poort waarop geluisterd word. Standaard is %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
 msgid "The server timeout in seconds. Default is %default"
-msgstr "De server wachttijd in seconden. Standaard is %default"
+msgstr "De serverwachttijd in seconden. Standaard is %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 ""
-"Het maximum aantal werk processen te gebruiken. Standaard is %default"
+msgstr "Het maximaal aantal threads te gebruiken. Standaard is %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
 msgid "Set a password to restrict access. By default access is unrestricted."
@@ -15449,15 +15915,15 @@ msgstr "Gebruikersnaam voor toegang. Standaard is %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
 msgid "The maximum size for displayed covers. Default is %default."
-msgstr "De maximale grootte voor omslag afbeeldingein. Standaard is %default"
+msgstr "De maximale grootte voor omslagafbeeldingen. Standaard is %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 ""
-"Het maximum aantal resultaten dat zichtbaar is per OPDS zoekvraag. Dit "
-"beinvloed Standa, WordPlayer, etc. integratie."
+"Het maximaal aantal resultaten dat zichtbaar is per OPDS-zoekvraag. Dit "
+"beinvloedt integratie met Standa, WordPlayer, enz."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43
 msgid ""
@@ -15465,7 +15931,7 @@ msgid ""
 "more than this number of items. Default: %default. Set to a large number to "
 "disable grouping."
 msgstr ""
-"Groepeer items in categorieën zoals auteur/labels op de eerste letter als er "
+"Groepeer items in categorieën zoals auteur/tags op de eerste letter als er "
 "meer dan dit aantal items zijn. Standaard: %default. Maak hier een groot "
 "getal van om groeperen uit te zetten."
 
@@ -15518,7 +15984,7 @@ msgstr "Populariteit"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:275
 msgid "Sort by"
-msgstr "Sorteren met"
+msgstr "Sorteren op"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:278
 msgid "library"
@@ -15542,7 +16008,7 @@ msgstr "Alle boeken"
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:386
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:451
 msgid "Browse books by"
-msgstr "Verken boeken met"
+msgstr "Verken boeken per"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:391
 msgid "Choose a category to browse by:"
@@ -15550,7 +16016,7 @@ msgstr "Kies een categorie om mee te verkennen"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:521
 msgid "Browsing by"
-msgstr "Verkennen met"
+msgstr "Verkennen per"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:522
 msgid "Up"
@@ -15570,7 +16036,7 @@ msgstr "Andere formaten"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:747
 msgid "Read %(title)s in the %(fmt)s format"
-msgstr ""
+msgstr "Lees %(title)s in het %(fmt)s-formaat"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:752
 msgid "Get"
@@ -15614,18 +16080,18 @@ msgstr ""
 "toont je bibliotheek op het internet. De standaard interface\n"
 "laat je je bibliotheek verkennen per categorie. Je kunt ook\n"
 "een interface krijgen die optimaal is ingesteld voor mobiele \n"
-"browsers op /mobiel en een OPDS gebaseerde interface\n"
+"browsers op /mobiel en een op OPDS gebaseerde interface\n"
 "voor gebruik met leesprogramma's op /opds.\n"
 "\n"
-"De OPDS interface wordt automatisch via Bonjour gepresenteerd.\n"
+"De OPDS-interface wordt automatisch via Bonjour gepresenteerd.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:52
 msgid "Path to the library folder to serve with the content server"
-msgstr "Pad naar de bibliotheek map voor de content server"
+msgstr "Pad naar de bibliotheekmap voor de content server"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:54
 msgid "Write process PID to the specified file"
-msgstr "Schrijf het proces-PID naar het opgegeven bestand."
+msgstr "Schrijf het PID van het proces naar het opgegeven bestand."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:58
 msgid ""
@@ -15633,7 +16099,7 @@ msgid ""
 "overrides any per-library settings specified in the GUI"
 msgstr ""
 "Specificeert een beperking die gebruikt wordt bij deze aanroeping. Deze "
-"optie gaat boven elke per-bibliotheek instelling gespecificeerd in de GUI"
+"optie gaat boven elke instelling per bibliotheek gespecificeerd in de GUI"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/main.py:62
 msgid ""
@@ -15661,11 +16127,11 @@ msgstr "LABELS: %s<br />"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:174
 msgid "SERIES: %s [%s]<br />"
-msgstr "SERIES: %s [%s]<br />"
+msgstr "REEKS: %s [%s]<br />"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:267
 msgid "Books in your library"
-msgstr "Boeken in uw bibliotheek"
+msgstr "Boeken in jouw bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:273
 msgid "By "
@@ -15689,7 +16155,7 @@ msgid ""
 "arguments in quotation marks."
 msgstr ""
 "Als je parameters met spaties meegeeft aan %prog , denk er dan aan om hier "
-"quotatie tekens ( \" ) om heen te zetten."
+"aanhalingstekens ( \" ) rond te zetten."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:697
 msgid "Path to the database in which books are stored"
@@ -15705,23 +16171,23 @@ msgstr "Toegangssleutel voor isbndb.com"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:703
 msgid "Default timeout for network operations (seconds)"
-msgstr "Standaard timeout voor netwerk operaties"
+msgstr "Standaard time-out voor netwerkoperaties"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:705
 msgid "Path to directory in which your library of books is stored"
-msgstr "Pad naar folder waarin je bibliotheek is opgeslagen"
+msgstr "Pad naar map waarin je bibliotheek is opgeslagen"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:707
 msgid "The language in which to display the user interface"
-msgstr "De taal waarin de gebruikers vensters worden weergegeven"
+msgstr "De taal waarin de gebruikersvensters worden weergegeven"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:709
 msgid "The default output format for ebook conversions."
-msgstr "Het standaard uitvoer formaat voor eboek conversies."
+msgstr "Het standaard uitvoerformaat voor e-boekconversies."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:713
 msgid "Ordered list of formats to prefer for input."
-msgstr "Gesorteerde lijst met gewenste formaten foor invoer."
+msgstr "Gesorteerde lijst met preferentiële formaten voor invoer."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:715
 msgid "Read metadata from files"
@@ -15733,11 +16199,15 @@ msgid ""
 "and consume more resources. Most tasks like conversion/news download/adding "
 "books/etc. are affected by this setting."
 msgstr ""
+"Prioriteit van taakprocessen. Hogere prioriteit betekent dat ze meer "
+"middelen krijgen en sneller lopen. De meeste taken, zoals conversie, "
+"downloaden van nieuws en toevoegen van boeken worden beïnvloed door deze "
+"instelling."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:722
 msgid "Swap author first and last names when reading metadata"
 msgstr ""
-"Verwissel de voor- en achternaam van de auteur bij het inlezen van de "
+"Verwissel voor- en achternaam van de auteur bij het inlezen van de "
 "metagegevens"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:724
@@ -15746,7 +16216,7 @@ msgstr "Voeg nieuwe formaten toe aan bestaande boeken"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:726
 msgid "Tags to apply to books added to the library"
-msgstr "Tags die aan boeken toegevoegd worden die in de bibliotheek komen"
+msgstr "Tabels voor boeken die toegevoegd worden aan de bibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:730
 msgid "List of named saved searches"
@@ -15754,7 +16224,7 @@ msgstr "Lijst van opgeslagen zoekopdrachten"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:731
 msgid "User-created tag browser categories"
-msgstr "Door de gebruiker gecreëerde labelbrowser categoriën"
+msgstr "Door de gebruiker gecreëerde labelbrowsercategoriën"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:733
 msgid "How and when calibre updates metadata on the device."
@@ -15765,6 +16235,9 @@ msgid ""
 "When searching for text without using lookup prefixes, as for example, Red "
 "instead of title:Red, limit the columns searched to those named below."
 msgstr ""
+"Beperk zoeken tot de kolommen die hieronder vermeld zijn bij een "
+"zoekopdracht zonder prefix, zoals bijvoorbeeld ballingschap in plaats van "
+"title:ballingschap."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:740
 msgid ""
@@ -15773,10 +16246,13 @@ msgid ""
 "separated by commas. Only takes effect if you set the option to limit search "
 "columns above."
 msgstr ""
+"De kolommen waartoe zoeken zich beperkt bij een zoekopdracht zonder prefix, "
+"zoals bijvoorbeeld ballingschap in plaats van title:ballingschap. Heeft "
+"alleen invloed als de optie om dit zoeken te beperken is aangevinkt."
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:27
 msgid "failed to scan program. Invalid input {0}"
-msgstr ""
+msgstr "Programmascan mislukt. Ongeldige invoer {0}"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:32
 msgid " near "
@@ -15784,11 +16260,11 @@ msgstr " dichtbij "
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:38
 msgid "end of program"
-msgstr ""
+msgstr "programma-einde"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:75
 msgid "syntax error - program ends before EOF"
-msgstr ""
+msgstr "syntaxfout - programma eindigt voor EOF"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:101
 msgid "unknown id "
@@ -15796,7 +16272,7 @@ msgstr "onbekend id "
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:107
 msgid "unknown function {0}"
-msgstr ""
+msgstr "onbekende functie {0}"
 
 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:126
 msgid "missing closing parenthesis"
@@ -16085,7 +16561,7 @@ msgstr "Gestopt"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:54
 msgid "Finished"
-msgstr "Voltooid"
+msgstr "Klaar"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:76
 msgid "Working..."
@@ -16093,7 +16569,7 @@ msgstr "Bezig..."
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Brazilian Portuguese"
-msgstr "Braziliaans-Portugees"
+msgstr "Braziliaans Portugees"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "English (UK)"
@@ -16241,7 +16717,7 @@ msgstr "Kies thema (herstart nodig)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:109
 msgid "ERROR: Unhandled exception"
-msgstr "FOUT: Niet-verwerkte uitzondering"
+msgstr "FOUT: Niet-verwerkte exceptie"
 
 #: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:188
 msgid "No interpreter"
@@ -16253,14 +16729,14 @@ msgstr "Geen actieve interpreter gevonden. Probeer console te herstarten"
 
 #: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:203
 msgid "Interpreter died"
-msgstr "Interpreteren gestopt"
+msgstr "Interpreter gestopt"
 
 #: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:204
 msgid ""
 "Interpreter dies while excuting a command. To see the command, click Show "
 "details"
 msgstr ""
-"Interpreter vastgelopen tijdens het uitvoeren. Click toon details om het "
+"Interpreter vastgelopen tijdens het uitvoeren. Klik 'toon details' om het "
 "commando te zien."
 
 #: /home/kovid/work/calibre/src/calibre/utils/pyconsole/main.py:20
@@ -16281,7 +16757,7 @@ msgstr "Herstart console"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
-msgstr "URL heeft een sftp schema nodig"
+msgstr "URL heeft een sftp-schema nodig"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
@@ -16289,7 +16765,7 @@ msgstr "server moet in de vorm gebruiker@servername zijn"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
-msgstr "SSH sessie kon niet tot stand worden gebracht: "
+msgstr "SSH-sessie kon niet tot stand worden gebracht: "
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
@@ -16297,11 +16773,11 @@ msgstr "Authenticatie met server mislukt: %s"
 
 #: /home/kovid/work/calibre/src/calibre/utils/smtp.py:249
 msgid "Control email delivery"
-msgstr "Wijzig email verzending"
+msgstr "Wijzig zenden van mail"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:120
 msgid "Unknown section"
-msgstr "Onbekende sectie"
+msgstr "Onbekende paragraaf"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:142
 msgid "Unknown feed"
@@ -16321,7 +16797,7 @@ msgid ""
 "Useful for recipe development. Forces max_articles_per_feed to 2 and "
 "downloads at most 2 feeds."
 msgstr ""
-"Handig voor recept ontwikkeling. Forceer max_articles_per_feed als 2 en "
+"Handig voor receptontwikkeling. Forceer max_articles_per_feed als 2 en "
 "download niet meer dan 2 feeds."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:40
@@ -16336,102 +16812,102 @@ msgstr "Wachtwoord voor sites die een login vereisen."
 msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
-"Download niet de laatste versies van ingebouwde recepten van de calibre "
-"server"
+"Download de laatste versies van ingebouwde recepten van de calibre server "
+"niet"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:47
 msgid "Unknown News Source"
-msgstr "Onbekende Nieuwe Bron"
+msgstr "Onbekende Nieuwsbron"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
-msgstr "Het \"%s\" recept heeft een gebruikernaam en wachtwoord nodig"
+msgstr "Het \"%s\"-recept heeft een gebruikernaam en wachtwoord nodig"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Download voltooid"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " van "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tMislukte links:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Downloading feeds..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
-msgstr "feeds van index pagina"
+msgstr "feeds van indexpagina"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Probeer omslag te downloaden"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Genereren Colofon..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Begin download [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Feeds gedownload tot %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Kon omslag niet downloaden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Download omslag van %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
-msgstr "Colofon plaatje gedownload"
+msgstr "Colofonplaatje gedownload"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
-msgstr "Artikel zonder Naam"
+msgstr "Artikel zonder titel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artikel gedownload: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
-msgstr "Artikel download mislukt: %s"
+msgstr "download Artikel mislukt: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Downloading feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16439,18 +16915,18 @@ msgstr ""
 "Inloggen niet gelukt. Controleer je gebruikersnaam en wachtwoord voor de "
 "calibre periodiekendienst."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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 ""
 "Je hebt geen toestemming dit nummer te downloaden. Of je abonnement is "
-"verlopen, of je hebt het maximum aantal toegestane downloads voor vandaag "
+"verlopen, of je hebt het maximaal aantal toegestane downloads voor vandaag "
 "overschreden."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:46
 msgid "You"
-msgstr "U"
+msgstr "Je"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:75
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:84
@@ -16465,32 +16941,32 @@ msgstr "Aangepast"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:118
 msgid "Next section"
-msgstr ""
+msgstr "Volgende paragraaf"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:121
 msgid "Main menu"
-msgstr ""
+msgstr "Hoofdmenu"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:125
 msgid "Previous section"
-msgstr ""
+msgstr "Volgende paragraaf"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:214
 msgid "Section Menu"
-msgstr ""
+msgstr "Paragraafmenu"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:217
 msgid "Main Menu"
-msgstr ""
+msgstr "Hoofdmenu"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:303
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:393
 msgid "Sections"
-msgstr ""
+msgstr "Paragrafen"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/templates.py:390
 msgid "Articles"
-msgstr ""
+msgstr "Artikels"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:476
 msgid ""
@@ -16500,19 +16976,19 @@ msgid ""
 msgstr ""
 "%prog URL\n"
 "\n"
-"Waar URL is bijvoorbeeld http://google.com"
+"Waar URL bijvoorbeeld http://google.com is"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:479
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
-"Basis map waar de URL naar toe wordt geschreven. Standaard is %default"
+"Basismap waar de URL naar toe wordt geschreven. Standaard is %default"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
-"Timeout in seconden om te wachten op een antwoord van de server. Standaard: "
+"Time-out in seconden om te wachten op een antwoord van de server. Standaard: "
 "%default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
@@ -16520,7 +16996,7 @@ msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
-"Maximum aantal niveaus om recursief te zoeken -- de diepte van de te volgen "
+"Maximaal aantal niveaus om recursief te zoeken -- de diepte van de te volgen "
 "links. Standaard %default"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
@@ -16528,7 +17004,7 @@ msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
-"Het maximum aantal bestanden te downloaden. Dit is alleen van toepassing op "
+"Het maximaal aantal bestanden te downloaden. Dit is alleen van toepassing op "
 "bestanden in <a href> labels. Standaard is %default"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:490
@@ -16536,7 +17012,7 @@ msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
-"Minimum inteval in seconden tussen aaneensluitende downloads. Standaard is "
+"Minimuminterval in seconden tussen aaneensluitende downloads. Standaard is "
 "%default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:492
@@ -16544,7 +17020,7 @@ msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
-"De karakter codering voor de websites die je probeert te downloaden. "
+"De karaktercodering voor de websites die je probeert te downloaden. "
 "Standaard zal er worden geprobeerd om de codering te raden."
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
@@ -16553,10 +17029,10 @@ msgid ""
 "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 ""
-"Alleen links die overeenkomen met deze reguliere expressie zullen worden "
-"gevolgd. Deze optie kan meerdere keren worden opgegeven, in welk geval de "
-"link zal worden gevolgd als deze overeenkomt met ten minste een reguliere "
-"expressie. Standaard zullen alle links worden gevolgd."
+"Alleen links die overeenkomen met deze regexp zullen worden gevolgd. Deze "
+"optie kan meerdere keren worden opgegeven, in welk geval de link zal worden "
+"gevolgd als deze overeenkomt met ten minste een reguliere uitdrukking. "
+"Standaard zullen alle links worden gevolgd."
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
@@ -16565,10 +17041,15 @@ msgid ""
 "a link, it will be ignored.By default, no links are ignored. If both filter "
 "regexp and match regexp are specified, then filter regexp is applied first."
 msgstr ""
+"Links die overeenkomen met deze regexp zullen niet worden gevolgd. Deze "
+"optie kan meerdere keren worden opgegeven, in welk geval de link niet zal "
+"worden gevolgd als deze overeenkomt met ten minste een reguliere "
+"uitdrukking. Als zowel de filter- als de overeenkomstoptie gebruikt worden "
+"dan wordt de filte eerst toegepast."
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid "Do not download CSS stylesheets."
-msgstr "Download geen CSS stylesheets"
+msgstr "Download geen CSS-stylesheets"
 
 #~ msgid ""
 #~ "Set the author(s). Multiple authors should be set as a comma separated list. "
@@ -16602,9 +17083,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Output file name. Default is derived from input filename"
 #~ msgstr "Doel bestands naam. Standaard is gebaseerd op de bron bestandsnaam"
 
-#~ msgid "Separate paragraphs by blank lines."
-#~ msgstr "Scheid paragrafen met lege regels."
-
 #~ msgid ""
 #~ "Render HTML tables as blocks of text instead of actual tables. This is "
 #~ "neccessary if the HTML contains very large or complex tables."
@@ -16656,28 +17134,12 @@ msgstr "Download geen CSS stylesheets"
 #~ "Negeer de CSS. Zit kan of een pad naar een CCS stylesheet zijn, of een "
 #~ "string. Als het in string is, dan zal deze worden geïnterpreteerd als CSS."
 
-#~ msgid ""
-#~ "Use the <spine> element from the OPF file to determine the order in which "
-#~ "the HTML files are appended to the LRF. The .opf file must be in the same "
-#~ "directory as the base HTML file."
-#~ msgstr ""
-#~ "Gebruik het <spine> element van het OPF bestand om de volgorde te bepalen "
-#~ "waarin de HTML bestanden aan de LRF worden toegevoegd. Het .OPF bestand moet "
-#~ "zich in dezelfde folder bevinden als het basis HTML bestand."
-
 #~ msgid "Add detected chapters to the table of contents."
 #~ msgstr "Voeg gevonden hoofdstukken toe aan de inhoudsopgave."
 
 #~ msgid "Don't add links to the table of contents."
 #~ msgstr "Voeg geen links toe aan de inhoudsopgave."
 
-#~ msgid ""
-#~ "A regular expression. <a> tags whose href matches will be ignored. Defaults "
-#~ "to %default"
-#~ msgstr ""
-#~ "Een reguliere expressie. <a> tags waar de href mee overeen komt worden "
-#~ "genegeerd. Standaard: %default"
-
 #~ msgid ""
 #~ "The maximum number of levels to recursively process links. A value of 0 "
 #~ "means thats links are not followed. A negative value means that <a> tags are "
@@ -16687,12 +17149,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "0 betekent dat de links niet zullen worden gevolgd. Een negatieve waarde "
 #~ "betekent dat <a> tags worden genegeerd."
 
-#~ msgid ""
-#~ "Force a page break before tags whose names match this regular expression."
-#~ msgstr ""
-#~ "Forceer een pagina scheiding voor tags wiens naam overeenkomen met deze "
-#~ "reguliere expressie."
-
 #~ msgid ""
 #~ "Force a page break before an element having the specified attribute. The "
 #~ "format for this option is tagname regexp,attribute name,attribute value "
@@ -16705,31 +17161,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "class=\"chapter\" te vinden, gebruik: \"h\\d,class,chapter\". Standaard is "
 #~ "%default"
 
-#~ msgid ""
-#~ "If html2lrf does not find any page breaks in the html file and cannot detect "
-#~ "chapter headings, it will automatically insert page-breaks before the tags "
-#~ "whose names match this regular expression. Defaults to %default. You can "
-#~ "disable it by setting the regexp to \"$\". The purpose of this option is to "
-#~ "try to ensure that there are no really long pages as this degrades the page "
-#~ "turn performance of the LRF. Thus this option is ignored if the current page "
-#~ "has only a few elements."
-#~ msgstr ""
-#~ "Als html2lrf geen pagina scheidingen in het HTML bestand kan vinden en er "
-#~ "geen hoofdstukken worden herkend, dan zal het automatisch nieuwe pagina's "
-#~ "beginnen voor de tags die overeenkomen met deze reguliere expressie. "
-#~ "Standaard: %default.  Je kunt dit uitschakelen door \"$\" op te geven als "
-#~ "reguliere expressie. Het doel van deze optie is om te proberen ervoor te "
-#~ "zorgen dat er geen zeer lange pagina's voorkomen, aangezien die veel meer "
-#~ "tijd nodig hebben om om te slaan in LRF formaat. Deze optie zal worden "
-#~ "genegeerd als de huidige pagina weinig elementen bevat."
-
-#~ msgid ""
-#~ "The regular expression used to detect chapter titles. It is searched for in "
-#~ "heading tags (h1-h6). Defaults to %default"
-#~ msgstr ""
-#~ "De reguliere expressie die wordt gebruikt om hoofdstukken te herkennen. Deze "
-#~ "wordt gezocht in 'heading tags' (h1-h6). Standaard: %default"
-
 #~ msgid "Preprocess Baen HTML files to improve generated LRF."
 #~ msgstr "Verwerk Baen HTML bestanden om de gegenereerde RTF te verbeteren."
 
@@ -16829,23 +17260,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "De website %s moet eerst als een HTML bestand worden weggeschreven, waarna "
 #~ "je deze met html2rlf kunt converteren."
 
-#~ msgid ""
-#~ "Usage: %prog [options] mybook.html\n"
-#~ "\n"
-#~ "\n"
-#~ "%prog converts mybook.html to mybook.lrf. \n"
-#~ "%prog follows all links in mybook.html that point \n"
-#~ "to local files recursively. Thus, you can use it to \n"
-#~ "convert a whole tree of HTML files."
-#~ msgstr ""
-#~ "Gebruik: %prog [opties] mijnboek.html\n"
-#~ "\n"
-#~ "\n"
-#~ "%prog converteert mijnbook.html naar mijnboek.lrf \n"
-#~ "%prog volgt alle links in mijnboek.html die naar lokale \n"
-#~ "bestanden wijzen recursief. Het kan dus worden \n"
-#~ "gebruikt om hele folders in een keer te converteren."
-
 #~ msgid ""
 #~ "Usage: %prog [options] mybook.lit\n"
 #~ "\n"
@@ -16868,13 +17282,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "\n"
 #~ "%prog converteert mijnboek.mobi naar mijnboek.lrf"
 
-#~ msgid ""
-#~ "Path to output directory in which to create the HTML file. Defaults to "
-#~ "current directory."
-#~ msgstr ""
-#~ "Pad naar output folder waarin het HTML bestand word gemaakt. Standaard is "
-#~ "dit de huidige folder."
-
 #~ msgid ""
 #~ " is an image based PDF. Only conversion of text based PDFs is supported."
 #~ msgstr ""
@@ -16932,9 +17339,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Usage: %s file.lit"
 #~ msgstr "Gebruik: %s bestand.lit"
 
-#~ msgid "Usage: pdf-meta file.pdf"
-#~ msgstr "Gebruik: pdf-meta bestand.pdf"
-
 #~ msgid ""
 #~ "Could not fetch cover as server is experiencing high load. Please try again "
 #~ "later."
@@ -16945,27 +17349,12 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid " not found."
 #~ msgstr " niet gevonden."
 
-#~ msgid ""
-#~ "\n"
-#~ "%prog [options] ISBN\n"
-#~ "\n"
-#~ "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%prog [opties] ISBN\n"
-#~ "\n"
-#~ "Download een omslag afbeelding voor het boek geidentificeerd door ISBN via "
-#~ "LibraryThing.com\n"
-
 #~ msgid "No filename specified."
 #~ msgstr "Geen bestandsnaam opgegeven"
 
 #~ msgid "%prog [options] myebook.mobi"
 #~ msgstr "%prog [opties] mijnboek.mobi"
 
-#~ msgid "Output directory. Defaults to current directory."
-#~ msgstr "Output folder. Standaard is dit de huidige folder."
-
 #~ msgid "LibraryThing.com server error. Try again later."
 #~ msgstr "LibraryThing.com server fout. Probeer het later nog eens."
 
@@ -16975,9 +17364,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Invalid database location "
 #~ msgstr "Foutieve database locatie "
 
-#~ msgid "<br>Must be a directory."
-#~ msgstr "<br>Moet een folder zijn."
-
 #~ msgid "OEB ebook created in"
 #~ msgstr "OEB boek bemaakt in"
 
@@ -17002,15 +17388,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Invalid database location.<br>Cannot write to "
 #~ msgstr "Foutieve database locatie.<br>Kan niet schrijven naar "
 
-#~ msgid "Frequently used directories"
-#~ msgstr "Vaak gebruikte folders"
-
-#~ msgid "Remove a directory from the frequently used directories list"
-#~ msgstr "Verwijder een folder van de lijst met vaak gebruikte folders"
-
-#~ msgid "Add a directory to the frequently used directories list"
-#~ msgstr "Voeg een folder toe aan de lijst met vaak gebruikte folders"
-
 #~ msgid "Free unused diskspace from the database"
 #~ msgstr "Geef ongebruikte diskruimte uit de database terug"
 
@@ -17057,9 +17434,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Set conversion defaults"
 #~ msgstr "Zet conversie standaarden"
 
-#~ msgid "Fine tune the detection of chapter and section headings."
-#~ msgstr "stel de detectie van hoofdstuk en sectie koppen in"
-
 #~ msgid ""
 #~ "Specify the page settings like margins and the screen size of the target "
 #~ "device."
@@ -17090,9 +17464,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "<font color=\"gray\">No help available</font>"
 #~ msgstr "<font color=\"gray\">Help is niet beschikbaar</font>"
 
-#~ msgid "Bulk convert ebooks to LRF"
-#~ msgstr "Converteer meerdere eboeken naar LRF"
-
 #~ msgid "Convert to LRF"
 #~ msgstr "Converteer naar LRF"
 
@@ -17126,9 +17497,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid " pts"
 #~ msgstr " pts"
 
-#~ msgid "Insert &blank lines between paragraphs"
-#~ msgstr "Voeg &blanco regels to tussen paragrafen"
-
 #~ msgid "Ignore &tables"
 #~ msgstr "Negeer &tabellen"
 
@@ -17159,9 +17527,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Title based detection"
 #~ msgstr "Detectie gebaseerd op Titel"
 
-#~ msgid "&Regular expression:"
-#~ msgstr "&Reguliere expressie:"
-
 #~ msgid "Set the category"
 #~ msgstr "Geef de categorie"
 
@@ -17295,9 +17660,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Zoek de boekenlijst op titel of auteur<br><br>Meerdere woorden met spaties "
 #~ "worden allen gebruikt."
 
-#~ msgid "Edit meta information"
-#~ msgstr "Wijzig meta informatie"
-
 #~ msgid ""
 #~ "Search the list of books by title, author, publisher, tags and "
 #~ "comments<br><br>Words separated by spaces are ANDed"
@@ -17344,13 +17706,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Be more verbose while processing."
 #~ msgstr "Geef meer details tijdens het verwerken."
 
-#~ msgid ""
-#~ "The title for this recipe. Used as the title for any ebooks created from the "
-#~ "downloaded feeds."
-#~ msgstr ""
-#~ "De titel voor dit recept. Dit word gebruikt als titel voor alle eboeken die "
-#~ "worden gemaakt van de gedownloade feeds."
-
 #~ msgid ""
 #~ "Options to control web2disk (used to fetch websites linked from feeds)"
 #~ msgstr ""
@@ -17408,13 +17763,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Beschikbare standaard recepten zijn:\n"
 #~ "%s\n"
 
-#~ msgid ""
-#~ "The directory in which to store the downloaded feeds. Defaults to the "
-#~ "current directory."
-#~ msgstr ""
-#~ "De folder waarin de gedownloade feeds worden bewaards. Standaard: de huidige "
-#~ "folder."
-
 #~ msgid "Dont show the progress bar"
 #~ msgstr "Laat geen progressie zien"
 
@@ -17437,34 +17785,9 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Failed to download article: %s from %s\n"
 #~ msgstr "Artikel %s van %s kon niet worden gedownload\n"
 
-#~ msgid ""
-#~ "Any link that matches this regular expression will be ignored. This option "
-#~ "can be specified multiple times, in which case as long as any regexp matches "
-#~ "a link, it will be ignored.By default, no links are ignored. If both --"
-#~ "filter-regexp and --match-regexp are specified, then --filter-regexp is "
-#~ "applied first."
-#~ msgstr ""
-#~ "Iedere link die overeenkomst met deze reguliere expressie zal worden "
-#~ "overgeslagen. Deze optie kan meerdere keren worden opgegeven, en als een van "
-#~ "de expressies overeenkomst dan zal de link worden genegeerd. Standaard word "
-#~ "geen enkele link overgeslagen.  indien zowel --filter-regexp en --match-"
-#~ "regexp worden gebruikt, dan zal --filter-regexp allereerst worden toegepast."
-
-#~ msgid "Toolbar"
-#~ msgstr "Werkbalk"
-
 #~ msgid "Show &text in toolbar buttons"
 #~ msgstr "Laat &tekst zien in werkbalk knoppen"
 
-#~ msgid ""
-#~ "Specify the base font size in pts. All fonts are rescaled accordingly. This "
-#~ "option obsoletes the --font-delta option and takes precedence over it. To "
-#~ "use --font-delta, set this to 0. Default: %defaultpt"
-#~ msgstr ""
-#~ "Geet de basic letter grootte in pts. Alls lettertypen worden overeenkomstig "
-#~ "vergroot. Deze optie vervangt de --font-delta optie. Om --fonot-delta te "
-#~ "gebruiken, zet het op 0. STandaard: %defaultpt"
-
 #~ msgid "&Button size in toolbar"
 #~ msgstr "&Knop grootte in werkbalk"
 
@@ -17565,19 +17888,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "You must specify an input HTML file"
 #~ msgstr "Een bron HTML bestand is nodig"
 
-#~ msgid "The output directory. Default is the current directory."
-#~ msgstr "De uitvoer folder. Standaard is de huidige folder."
-
-#~ msgid "Character encoding for HTML files. Default is to auto detect."
-#~ msgstr "Karakter codering voor HTML bestanden. Standaard is auto detect."
-
-#~ msgid ""
-#~ "Create the output in a zip file. If this option is specified, the --output "
-#~ "should be the name of a file not a directory."
-#~ msgstr ""
-#~ "Genereer de uitvoer in een zip bestand. Als deze optie is gekozen, dan moet -"
-#~ "-output de naam van een bestand zijn, niet de folder."
-
 #~ msgid "Control the following of links in HTML files."
 #~ msgstr "Configueer het volgen van links in HTML bestanden."
 
@@ -17596,9 +17906,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Deze waarde kan niet negatief zijn. Gebruik 0 aan te geven dan links in het "
 #~ "top HTML bestand niet zullen worden gevolgd."
 
-#~ msgid "Set metadata of the generated ebook"
-#~ msgstr "Metadata van het gegenereerde eboek"
-
 #~ msgid "Options useful for debugging"
 #~ msgstr "Opties handig voor debuggen"
 
@@ -17621,21 +17928,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Geen meer informatie tijdens verwerking. Dit kan meerder malen worden "
 #~ "opgegeven om meer informatie te verkrijgen"
 
-#~ msgid ""
-#~ "Set the author in the metadata of the generated ebook. Default is %default"
-#~ msgstr ""
-#~ "De auteur in de metadata van het gegenereerde eboek. Standaard is %default"
-
-#~ msgid "Title for generated ebook. Default is to use the filename."
-#~ msgstr ""
-#~ "Titel voor gegenereerd eboek. Standaard word de bestandsnaam gebruikt."
-
-#~ msgid ""
-#~ "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
-#~ msgstr ""
-#~ "Opties voor de configuratie van de conversie van comics (CBR, CBZ) bestanden "
-#~ "naar eboek"
-
 #~ msgid "Number of colors for grayscale image conversion. Default: %default"
 #~ msgstr ""
 #~ "Aantal kleuren voor beeld conversie naar grijstinten. Standaard: %default"
@@ -17673,25 +17965,12 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Set defaults for conversion of comics"
 #~ msgstr "Zet standaarden voor conversie van comics"
 
-#~ msgid ""
-#~ "<p>Could not convert %d of %d books, because no suitable source format was "
-#~ "found.<ul>%s</ul>"
-#~ msgstr ""
-#~ "<p>%d  van %d boeken kon niet worden geconverteerd, omdat geen schikbaar "
-#~ "bron formaat kon worden gevonden:<ul>%s</ul>"
-
 #~ msgid "Convert comic: "
 #~ msgstr "Converteer comic: "
 
 #~ msgid "Convert book: "
 #~ msgstr "Converteer boek: "
 
-#~ msgid "Copying library to "
-#~ msgstr "Copieer bibliotheek naar "
-
-#~ msgid "Choose a location for your ebook library."
-#~ msgstr "Kies een locatie voor de eboek  bibliotheek"
-
 #~ msgid "Job stopped by user"
 #~ msgstr "Taak gestopt door gebruiker"
 
@@ -17708,18 +17987,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "De basis lettergrootte in pts. Standaard is het %defaultpt. Stel in op 0 om "
 #~ "het herschalen van lettertypen uit te schakelen"
 
-#~ msgid ""
-#~ "Remove spacing between paragraphs. Also sets a indent on paragraphs of "
-#~ "1.5em. You can override this by adding p {text-indent: 0cm} to --override-"
-#~ "css. Spacing removal will not work if the source file forces inter-paragraph "
-#~ "spacing."
-#~ msgstr ""
-#~ "Verwijderd spatiëring tussen de paragrafen. Voegt eveneens een inspringen "
-#~ "van 1,5em toe aan paragrafen. U kan dit overschrijven door p {text-indent: "
-#~ "0cm} toe te voegen aan --override-css. Het verwijderen van spatiëring tussen "
-#~ "de paragrafen zal niet werken indien het bronbestand spatiëring dwingt "
-#~ "tussen paragrafen."
-
 #~ msgid "Set the left margin in pts. Default is %default"
 #~ msgstr "Bepaal de linkermarge in pts. Standaard is het %default"
 
@@ -17799,14 +18066,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Schijf %s kan niet worden gevonden. Uw kernel gebruikt waarschijnlijk een "
 #~ "verouderde versie van SYSFS"
 
-#~ msgid "The regular expression to use to remove the footer."
-#~ msgstr "De reguliere expressie te gebruiken om de voetnoot de verwijderen"
-
-#~ msgid "Use a regular expression to try and remove the footer."
-#~ msgstr ""
-#~ "Gebruik een reguliere expressie om te proberen de voetnoot te vinden en "
-#~ "verwijderen."
-
 #~ 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."
@@ -17815,23 +18074,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "van een oudere gedeeltelijke conversie van een PDF bestand. Standaard is "
 #~ "%default , wat dit uitschakeld."
 
-#~ msgid ""
-#~ "Do not force text to be justified in output. Whether text is actually "
-#~ "displayed justified or not depends on whether the ebook format and reading "
-#~ "device support justification."
-#~ msgstr ""
-#~ "Forceer geen tekst uitlijning in de uitvoer. Of de tekst al dan niet wordt "
-#~ "uitgelijnd hangt af van of het eboek formaat en de gebruikte lees apparaat "
-#~ "al dan niet ijtlijning ondersteunen."
-
-#~ msgid "The regular expression to use to remove the header."
-#~ msgstr ""
-#~ "De reguliere expressie die wordt gebruikt om de koptekst te verwijderen"
-
-#~ msgid "Use a regular expression to try and remove the header."
-#~ msgstr ""
-#~ "Gebruik een reguliere expressie om te proberen de koptekst te verwijderen"
-
 #~ msgid ""
 #~ "Transliterate unicode characters to an ASCII representation. Use with care "
 #~ "because this will replace unicode characters with ASCII. For instance it "
@@ -17850,13 +18092,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "LibraryThing.com timed out. Try again later."
 #~ msgstr "Verbinding met LibraryThing.com verbroken. Probeer later nog eens."
 
-#~ msgid "Output file. Default is derived from input filename."
-#~ msgstr ""
-#~ "Uitvoer bestand. Standaard wordt deze afgeleidt uit de invoer bestandsnaam."
-
-#~ msgid "Usage: ebook-convert INFILE OUTFILE [OPTIONS..]"
-#~ msgstr "Gebruik: eboek-convert INVOER UITVOER [OPTIES..]"
-
 #~ msgid "Produce more human-readable XML output."
 #~ msgstr "Genereer meer menselijk-leesbare XML uitvoer."
 
@@ -17885,9 +18120,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Dit RTF bestand gebruikt functies die calibre niet ondersteund. Converteer "
 #~ "het eerst naar HTML alvorens het nogmaals te proberen."
 
-#~ msgid "Do not add a blank line between paragraphs."
-#~ msgstr "Voeg geen blanco regel in tussen paragrafen."
-
 #~ msgid ""
 #~ "Run the text input through the markdown pre-processor. To learn more about "
 #~ "markdown see"
@@ -17898,13 +18130,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Add a tab at the beginning of each paragraph."
 #~ msgstr "Voeg een tab toe aan het begin van iedere paragraaf."
 
-#~ msgid ""
-#~ "Specify the character encoding of the output document. The default is utf-8. "
-#~ "Note: This option is not honored by all formats."
-#~ msgstr ""
-#~ "Specificeer de karakter codering van het uitvoer document. De standaard is "
-#~ "utf-8. Deze optie word niet door alle formaten nageleefd."
-
 #~ msgid "Sort tags list by popularity"
 #~ msgstr "Sorteer tag lijst by populariteit"
 
@@ -17929,18 +18154,9 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "~"
 #~ msgstr "~"
 
-#~ msgid "Header regular expression:"
-#~ msgstr "Koptekst reguliere expressie:"
-
-#~ msgid "Footer regular expression:"
-#~ msgstr "Voetnoot reguliere expressie:"
-
 #~ msgid "PDB Input"
 #~ msgstr "PDB Invoer"
 
-#~ msgid "&Preprocess input file to possibly improve structure detection"
-#~ msgstr "&Voorbewerk invoer bestand voor mogelijk betere structuur detectie"
-
 #~ msgid "Remove F&ooter"
 #~ msgstr "Verwijder &Voetnoot"
 
@@ -17950,27 +18166,9 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Add a tab at the beginning of each paragraph"
 #~ msgstr "Voerg een tab toe aan het begin van iedere paragraaf"
 
-#~ msgid "Use a wizard to help construct the XPath expression"
-#~ msgstr "Gebruik een wizard om te helpen een XPath expressie te construeren"
-
 #~ msgid "Force maximum line lenght"
 #~ msgstr "forceer maximum regel lengte"
 
-#~ msgid "Send specific format to storage card B"
-#~ msgstr "Zend specifiek formaat naar opslag kaart B"
-
-#~ msgid "Send specific format to storage card A"
-#~ msgstr "Zend specifiek formaat naar opslag kaart A"
-
-#~ msgid "Send specific format to main memory"
-#~ msgstr "Zend specifiek formaat naar hoofdgeheugen"
-
-#~ msgid "Sent by email:"
-#~ msgstr "Verstuurd via email:"
-
-#~ msgid "Failed to email the following books:"
-#~ msgstr "De volgende boeken konden niet worden ge-emailed:"
-
 #~ msgid "Failed to email books"
 #~ msgstr "Boeken konden niet worden ge-emailed."
 
@@ -18043,14 +18241,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Abort the editing of all remaining books"
 #~ msgstr "Annuleer het bewerken van alle overgebleven boeken"
 
-#~ msgid ""
-#~ "Automatically create the author sort entry based on the current author entry"
-#~ msgstr ""
-#~ "Creër automatisch de auteur sortering gebaseerd op de huidige auteur ingave"
-
-#~ msgid "Download &cover"
-#~ msgstr "Download &omslag afbeelding"
-
 #~ msgid "day"
 #~ msgstr "dag"
 
@@ -18130,13 +18320,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Invalid library location"
 #~ msgstr "Ongeldige bibliotheek locatie"
 
-#~ 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>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."
-
 #~ msgid "Could not access %s. Using %s as the library."
 #~ msgstr "Geen toegang tot %s. Gebruik %s als bibliotheek."
 
@@ -18194,9 +18377,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "DRM Error"
 #~ msgstr "DRM foutmelding"
 
-#~ msgid "Ebook Viewer"
-#~ msgstr "Eboek Viewer"
-
 #~ msgid ""
 #~ "Card A\n"
 #~ "%s\n"
@@ -18261,15 +18441,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Denk er aan om calibre open te laten, aangezien de server alleen werkt "
 #~ "zolang calibre draait"
 
-#~ 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 ""
-#~ "Als je de wordplayer eboek applicatie gebruikt op je Android telefoon, dan "
-#~ "kun je de calibre boek collectie direct op je telefoon bekijken. Om dit te "
-#~ "doen zul je de content server moeten inschakelen."
-
 #~ msgid ""
 #~ "Dont forget to enter your gmail username and password. You can sign up for a "
 #~ "free gmail account at http://gmail.com"
@@ -18292,9 +18463,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Checking for missing files."
 #~ msgstr "Zoeken naar verloren bestanden"
 
-#~ msgid "The author sort string"
-#~ msgstr "De auteur sorteer sleutel"
-
 #~ msgid ""
 #~ "The format in which to output the data. Available choices: %s. Defaults is "
 #~ "text."
@@ -18302,9 +18470,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Het formaat waarin de data uitvoer plaatsvind. Beschikbare keuzen: %s. "
 #~ "Standaard is text."
 
-#~ msgid "The series number"
-#~ msgstr "Het serie nummer"
-
 #~ msgid ""
 #~ "Comma separated list of formats to save for each book. By default all "
 #~ "available books are saved."
@@ -18321,14 +18486,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "\n"
 #~ "Start de calibre content server"
 
-#~ msgid "Password to access your calibre library. Username is "
-#~ msgstr ""
-#~ "Wachtwoord om toegang te verkrijgen tot je calibre bibliotheek. "
-#~ "Gebruikersnaam is "
-
-#~ msgid "The priority of worker processes"
-#~ msgstr "De prioriteit van werk processen"
-
 #~ msgid "English (TH)"
 #~ msgstr "Engels (TH)"
 
@@ -18351,48 +18508,15 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Download latest version of builtin recipes"
 #~ msgstr "Download de laatste versie van de ingebouwde recepten"
 
-#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-#~ msgstr "Communiceer met de Sony PRS-300/505/500 eBoek lezer."
-
 #~ msgid "English (CY)"
 #~ msgstr "Engels (CY)"
 
-#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-#~ msgstr "Communiceer met de Sony PRS-600/700/900 eBoek lezer."
-
 #~ msgid "English (PK)"
 #~ msgstr "Engels (PK)"
 
 #~ msgid "Fit &cover to view"
 #~ msgstr "Schaal &omslag naar schermgrootte"
 
-#~ 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 ""
-#~ "Hier kun je instellen hoe calibre je boeken bewaard wanneer je op de "
-#~ "verstuur naar apparaat knop drukt. Deze instelling kan worden genegeerd voor "
-#~ "bepaalde apparaten door de apparaat interface plugins in te stellen onder "
-#~ "voorkeuren -> plugins."
-
-#~ msgid ""
-#~ "The fields to output when cataloging books in the database.  Should be a "
-#~ "comma-separated list of fields.\n"
-#~ "Available fields: all, author_sort, authors, comments, cover, formats, id, "
-#~ "isbn, pubdate, publisher, rating, series_index, series, size, tags, "
-#~ "timestamp, title, uuid.\n"
-#~ "Default: '%default'\n"
-#~ "Applies to: CSV, XML output formats"
-#~ msgstr ""
-#~ "De velden om uit te voeren wanneer boeken in de database worden geindexeerd. "
-#~ "Komma gescheiden velden.\n"
-#~ "Beschikbare velden: all, author_sort, authors, comments, cover, formats, id, "
-#~ "isbn, pubdate, publisher, rating, series_index, series, size, tags, "
-#~ "timestamp, title, uuid.\n"
-#~ "Standaard: '%default'\n"
-#~ "Betreft: CSV, XML uitvoer formaten"
-
 #~ msgid "Paste Image"
 #~ msgstr "Afbeelding Plakken"
 
@@ -18435,25 +18559,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "'Don't include this book' tag:"
 #~ msgstr "'Gebruik dit boek niet' label:"
 
-#~ msgid "Tags to exclude as genres (regex):"
-#~ msgstr "Labels te vermeiden als genres (reguliere expressie):"
-
-#~ msgid "Create catalog of books in your calibre library"
-#~ msgstr "Maak catalogus van boeken in je calibre bibliotheek"
-
-#~ 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: CSV, XML output formats"
-#~ msgstr ""
-#~ "De velden voor de uitvoer van catalogus van boeken in de database. komma-"
-#~ "gescheiden lijst met velden.\n"
-#~ "Beschikbare velden: %s\n"
-#~ "Standaard: '%%default'\n"
-#~ "Betrekking tot: CSV, XML uitvoer formaten"
-
 #~ msgid "No books selected to generate catalog for"
 #~ msgstr "Geen boeken geselecteerd voor catalogus"
 
@@ -18466,29 +18571,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Default: '%default'\n"
 #~ "Applies to: ePub, MOBI output formats"
 
-#~ msgid ""
-#~ "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n"
-#~ "Default: '%default'\n"
-#~ "Applies to: ePub, MOBI output formats"
-#~ msgstr ""
-#~ "Label prefix voor gebruiker notities, bv. '*Misschien vindt Jeff dit een "
-#~ "leuk boek'\n"
-#~ "Standaard: '%default'\n"
-#~ "Betrekking tot: ePub, MOBI uitvoer formaten"
-
-#~ 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 ""
-#~ "Bewaar de uitvoer van verschillende stadia van het conversie proces in de "
-#~ "opgegeven folder. Handig als je niet zeker weet wanneer fouten optreden "
-#~ "tijdens de conversie.\n"
-#~ "Standaard: '%default'None\n"
-#~ "Betrekking tot: ePub, MOBI uitvoer formaten"
-
 #~ msgid " "
 #~ msgstr " "
 
@@ -18588,9 +18670,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Tag on book"
 #~ msgstr "Tag op boek"
 
-#~ msgid "Automatically number books in this series"
-#~ msgstr "Nummer de boeken in deze serie automatisch"
-
 #~ msgid "(%d found)"
 #~ msgstr "(%d gevonden)"
 
@@ -18660,29 +18739,9 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Click to open Book Details window"
 #~ msgstr "Klik om het Boek detail venster te openen"
 
-#~ msgid "Send specific format"
-#~ msgstr "Verzend specifiek formaat"
-
 #~ msgid " and delete from library"
 #~ msgstr " en verwijder ze uit de bibliotheek"
 
-#~ 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 ""
-#~ "De waarde <b>%d</ b> die u hebt gekozen voor de server-poort is een systeem-"
-#~ "poort. Uw besturingssysteem kan het gebruik van deze poort blokkeren en "
-#~ "voorkomen dat de server op deze poort draait. Het is veiliger te kiezen voor "
-#~ "een poortnummer groter dan 1024."
-
-#~ msgid ""
-#~ "The changes you made require that Calibre be restarted. Please restart as "
-#~ "soon as practical."
-#~ msgstr ""
-#~ "De door u aangebrachte wijzigingen vereisen dat Calibre opnieuw opgestart "
-#~ "moet worden. Herstart zo spoedig mogelijk."
-
 #~ msgid "Preserve device collections."
 #~ msgstr "Bewaar collecties op het apparaat"
 
@@ -18705,17 +18764,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Column &type"
 #~ msgstr "Kolom &type"
 
-#~ 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 ""
-#~ "Geselecteerde boeken worden automatisch genummerd,\n"
-#~ "in de volgorde waarin u ze geselecteerd hebt.\n"
-#~ "Dus als je u eerst boek A en daarna boek B selecteerd,\n"
-#~ "dan zal Boek A nr 1 en boek B nr 2 in de serie krijgen."
-
 #~ msgid "Failed to download some metadata"
 #~ msgstr "Sommige metagegevens konden niet worden gedownload"
 
@@ -18762,21 +18810,10 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Read metadata only from &file name"
 #~ msgstr "Lees metagegevens alleen uit de &bestandsnaam"
 
-#~ msgid ""
-#~ "No metadata found, try adjusting the title and author or the ISBN key."
-#~ msgstr ""
-#~ "Geen metagegevens gevonden, probeer een andere titel en auteur of een ander "
-#~ "ISBN nummer."
-
 #~ msgid "Contains: the word or phrase matches anywhere in the metadata"
 #~ msgstr ""
 #~ "Bevat: het woord of de uitdrukking komt ergens in de metagegevens voor"
 
-#~ msgid ""
-#~ "Regular expression: the expression must match anywhere in the metadata"
-#~ msgstr ""
-#~ "Reguliere expressie: de expressie moet ergens in de metagegevens voorkomen"
-
 #~ msgid "Equals: the word or phrase must match an entire metadata field"
 #~ msgstr ""
 #~ "Gelijk aan: het woord of de zin komt overeen met een compleet veld in de "
@@ -18826,45 +18863,12 @@ msgstr "Download geen CSS stylesheets"
 #~ "trachten deze zaken op te sporen om ze om te vormen naar een formaat waar "
 #~ "epubcheck geen problemen mee heeft."
 
-#~ 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 ""
-#~ "Indien aangevinkt zal een collectie op het apparaat niet worden verwijderd, "
-#~ "ook al is er een boek met gewijzigde metadata aanwezig en de collectie is "
-#~ "daarin niet in aanwezig. Tevens zal de mogelijkheid om collecties aan te "
-#~ "passen in de apparaat weergave worden mogelijk gemaakt. Indien niet "
-#~ "aangevinkt zullen de collecties op het apparaat steeds overeenkomen met de "
-#~ "metadata in de calibre bibliotheek."
-
 #~ msgid "Show &donate button (restart)"
 #~ msgstr "Geef &donatieknop weer (herstart)"
 
 #~ msgid "Cannot use tag editor"
 #~ msgstr "Het is niet mogelijk om het labelopmaakprogramma te gebruiken"
 
-#~ 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>"
-
 #~ 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 "
@@ -19037,20 +19041,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Standaard: '%%default'\n"
 #~ "Van toepassing voor: BIBTEX weergave formaat"
 
-#~ 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"
-#~ "Default: '%default'\n"
-#~ "Applies to: ePub, MOBI output formats"
-#~ msgstr ""
-#~ "Komma-gescheiden lijst van tag woorden die aangeeft dat het boek uit de "
-#~ "uitvoer moet gehouden worden.  Neit hoofdletter gevoelig.\n"
-#~ "--exclude-tags=skip komt overeen met 'skip this book' en 'Skip will like "
-#~ "this'\n"
-#~ "Standaard: '%default'\n"
-#~ "Is van toepassing op: ePub, MOBI uitvoer formaten"
-
 #~ msgid "Toolbars/Context menus"
 #~ msgstr "Knoppenbalken/Context menu's"
 
@@ -19111,17 +19101,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Metagegevens worden gebackupped als Calibre aan staat, ongeveer met 1 boek "
 #~ "per seconde."
 
-#~ msgid ""
-#~ "This command rebuilds your calibre database from the information stored by "
-#~ "calibre in the OPF files.<p>This function is not currently available in the "
-#~ "GUI. You can recover your database using the 'calibredb restore_database' "
-#~ "command line function."
-#~ msgstr ""
-#~ "Deze actie maakt de Calibre bibliotheek opnieuw vanaf de informatie die is "
-#~ "opgeslagen in de OPF bestanden.<p>Deze functie is (nog) niet beschikbaar in "
-#~ "de GUI. Je kunt de database herstellen door 'calibredb restore_database\" te "
-#~ "gebruiken met de CLI."
-
 #~ msgid "Include 'Series' Section"
 #~ msgstr "Voeg 'Series\" gedeelte toe"
 
@@ -19137,25 +19116,9 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Check Library"
 #~ msgstr "Controleer Bibliotheek"
 
-#~ msgid ""
-#~ "<b>You can destroy your library using this feature.</b> Changes are "
-#~ "permanent. There is no undo function.  This feature is experimental, and "
-#~ "there may be bugs. You are strongly encouraged to back up your library "
-#~ "before proceeding.<p>Search and replace in text fields using character "
-#~ "matching or regular expressions. "
-#~ msgstr ""
-#~ "<b>Je kunt je bibliotheek met deze functie kapot maken.</b> Veranderingen "
-#~ "zijn permanent. Je kunt niet ongedaan maken. Deze functie is experimenteel "
-#~ "en er kunnen fouten optreden. Je wordt sterk aangeraden eerst een backup van "
-#~ "je bibliotheek te maken voor je verder gaat.<p>Zoek en vervang in "
-#~ "tekstvelden met karaktercombinaties of reguliere expressies. "
-
 #~ msgid "Change title to title case"
 #~ msgstr "Verander titel naar hoofdletters"
 
-#~ msgid "Clear series"
-#~ msgstr "Verwijder serie"
-
 #~ msgid "Apply function after replace:"
 #~ msgstr "Functie toepassen na vervanging:"
 
@@ -19200,6 +19163,9 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Tags to apply when adding a book:"
 #~ msgstr "Tags om toe te voegen wanneer je een boek toevoegt:"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Splits de werkbalk in twee werkbalken"
+
 #~ msgid "<p>Field template. Uses the same syntax as save templates."
 #~ msgstr "<p>Veld template. Gebruikt dezelfde syntax als opslagtemplates."
 
@@ -19223,9 +19189,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Je moet de --het-herstel-echt-doen optie nog instellen om een herstel te "
 #~ "doen."
 
-#~ msgid "Read %s in the %s format"
-#~ msgstr "Lees %s in het %s formaat"
-
 #~ msgid "Read metadata from &file contents rather than file name"
 #~ msgstr "Lees metagegevens van bestandsinhoud in plaats van &filenaam"
 
@@ -19233,17 +19196,6 @@ msgstr "Download geen CSS stylesheets"
 #~ msgstr ""
 #~ "Geef een nieuwe categorienaam op. Selecteer het type voor het toevoegen."
 
-#~ 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 ""
-#~ "Normaal gesproken behandelt calibre blanco regels als paragraaf markering. "
-#~ "Met deze optie zal het aannemen dat iedere regel die begint met een "
-#~ "indentatie (een tab, of twee of meer spaties) een paragraaf voorstelt. "
-#~ "Paragrafen eindigen wanneer de volgende lijn met een indentatie word bereikt."
-
 #~ msgid ""
 #~ "Normally calibre treats blank lines as paragraph markers. With this option "
 #~ "it will assume that every line represents a paragraph instead."
@@ -19251,51 +19203,6 @@ msgstr "Download geen CSS stylesheets"
 #~ "Normaal gesproken behandelt calibre blanco regels als paragraaf markering. "
 #~ "Met deze optie zal het aannemen dat iedere regel een paragraaf representeert."
 
-#~ msgid ""
-#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-#~ "type=\"text/css\">\n"
-#~ "p, li { white-space: pre-wrap; }\n"
-#~ "</style></head><body style=\" font-family:'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;\">Set a regular expression "
-#~ "pattern to use when trying to guess ebook metadata from filenames. </p>\n"
-#~ "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">A <a "
-#~ "href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
-#~ "decoration: underline; color:#0000ff;\">reference</span></a> on the syntax "
-#~ "of regular expressions is available.</p>\n"
-#~ "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" "
-#~ "font-weight:600;\">Test</span> functionality below to test your regular "
-#~ "expression on a few sample filenames. The group names for the various "
-#~ "metadata entries are documented in tooltips.</p></body></html>"
-#~ msgstr ""
-#~ "<!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;\">Geef een reguliere "
-#~ "expressie patroon op om te gebruiken bij  het raden van eboek metagegevens "
-#~ "gebaseerd op bestandsnamen.</p>\n"
-#~ "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">Een <a "
-#~ "href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
-#~ "decoration: underline; color:#0000ff;\">referentie</span></a> betreffende de "
-#~ "syntax voor reguliere expressies is beschikbaar.</p>\n"
-#~ "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">Gebruik de <span style=\" "
-#~ "font-weight:600;\">Test</span> functionaliteit hieronder om de reguliere "
-#~ "expressie uit te proberen op een aantal test bestandsnamen. De groepnamen "
-#~ "voor de diverse metadata velden zijn gedocumenteerd onder "
-#~ "tooltips.</p></body></html>"
-
 #~ 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 "
@@ -19363,3 +19270,617 @@ msgstr "Download geen CSS stylesheets"
 
 #~ msgid "Extra covers in books"
 #~ msgstr "Extra omslagen in boeken"
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Gereedschapsbalk aanpassen"
+
+#~ msgid "Customize searching"
+#~ msgstr "Zoekmethode aanpassen"
+
+#~ msgid "No valid plugin found in "
+#~ msgstr "Geen geldige plug-in gevonden in "
+
+#~ msgid "Third Expression"
+#~ msgstr "Derde regexp"
+
+#~ msgid "Days of week"
+#~ msgstr "Dagen van de week"
+
+#~ msgid "Separate paragraphs by blank lines."
+#~ msgstr "Scheid alinea's met lege regels."
+
+#~ msgid ""
+#~ "Use the <spine> element from the OPF file to determine the order in which "
+#~ "the HTML files are appended to the LRF. The .opf file must be in the same "
+#~ "directory as the base HTML file."
+#~ msgstr ""
+#~ "Gebruik het <spine> element van het OPF-bestand om de volgorde te bepalen "
+#~ "waarin de HTML bestanden aan de LRF worden toegevoegd. Het .OPF bestand moet "
+#~ "zich in dezelfde map bevinden als het basis HTML bestand."
+
+#~ msgid ""
+#~ "A regular expression. <a> tags whose href matches will be ignored. Defaults "
+#~ "to %default"
+#~ msgstr ""
+#~ "Een regexp. <a> tags waar de href mee overeen komt worden genegeerd. "
+#~ "Standaard: %default"
+
+#~ msgid ""
+#~ "Force a page break before tags whose names match this regular expression."
+#~ msgstr ""
+#~ "Forceer een pagina scheiding voor tags wiens naam overeenkomen met deze "
+#~ "regexp."
+
+#~ msgid ""
+#~ "If html2lrf does not find any page breaks in the html file and cannot detect "
+#~ "chapter headings, it will automatically insert page-breaks before the tags "
+#~ "whose names match this regular expression. Defaults to %default. You can "
+#~ "disable it by setting the regexp to \"$\". The purpose of this option is to "
+#~ "try to ensure that there are no really long pages as this degrades the page "
+#~ "turn performance of the LRF. Thus this option is ignored if the current page "
+#~ "has only a few elements."
+#~ msgstr ""
+#~ "Als html2lrf geen pagina scheidingen in het HTML bestand kan vinden en er "
+#~ "geen hoofdstukken worden herkend, dan zal het automatisch nieuwe pagina's "
+#~ "beginnen voor de tags die overeenkomen met deze regexp. Standaard: %default. "
+#~ " Je kunt dit uitschakelen door \"$\" op te geven als regexp. Het doel van "
+#~ "deze optie is om te proberen ervoor te zorgen dat er geen zeer lange "
+#~ "pagina's voorkomen, aangezien die veel meer tijd nodig hebben om om te slaan "
+#~ "in LRF formaat. Deze optie zal worden genegeerd als de huidige pagina weinig "
+#~ "elementen bevat."
+
+#~ msgid ""
+#~ "The regular expression used to detect chapter titles. It is searched for in "
+#~ "heading tags (h1-h6). Defaults to %default"
+#~ msgstr ""
+#~ "De regexp die wordt gebruikt om hoofdstukken te herkennen. Deze wordt "
+#~ "gezocht in 'heading tags' (h1-h6). Standaard: %default"
+
+#~ msgid ""
+#~ "Usage: %prog [options] mybook.html\n"
+#~ "\n"
+#~ "\n"
+#~ "%prog converts mybook.html to mybook.lrf. \n"
+#~ "%prog follows all links in mybook.html that point \n"
+#~ "to local files recursively. Thus, you can use it to \n"
+#~ "convert a whole tree of HTML files."
+#~ msgstr ""
+#~ "Gebruik: %prog [opties] mijnboek.html\n"
+#~ "\n"
+#~ "\n"
+#~ "%prog converteert mijnbook.html naar mijnboek.lrf \n"
+#~ "%prog volgt alle links in mijnboek.html die naar lokale \n"
+#~ "bestanden wijzen recursief. Het kan dus worden \n"
+#~ "gebruikt om hele mappen in een keer te converteren."
+
+#~ msgid ""
+#~ "Path to output directory in which to create the HTML file. Defaults to "
+#~ "current directory."
+#~ msgstr ""
+#~ "Pad naar output map waarin het HTML bestand word gemaakt. Standaard is dit "
+#~ "de huidige map."
+
+#~ msgid "Usage: pdf-meta file.pdf"
+#~ msgstr "Gebruik: pdf-metabestand.pdf"
+
+#~ msgid ""
+#~ "\n"
+#~ "%prog [options] ISBN\n"
+#~ "\n"
+#~ "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%prog [opties] ISBN\n"
+#~ "\n"
+#~ "Download een omslagafbeelding voor het boek geidentificeerd door ISBN via "
+#~ "LibraryThing.com\n"
+
+#~ msgid "Output directory. Defaults to current directory."
+#~ msgstr "Output map. Standaard is dit de huidige map."
+
+#~ msgid "<br>Must be a directory."
+#~ msgstr "<br>Moet een map zijn."
+
+#~ msgid "Frequently used directories"
+#~ msgstr "Vaak gebruikte mappen"
+
+#~ msgid "Remove a directory from the frequently used directories list"
+#~ msgstr "Verwijder een map van de lijst met vaak gebruikte mappen"
+
+#~ msgid "Add a directory to the frequently used directories list"
+#~ msgstr "Voeg een map toe aan de lijst met vaak gebruikte mappen"
+
+#~ msgid "Fine tune the detection of chapter and section headings."
+#~ msgstr "stel de detectie van hoofdstuk en paragraaf koppen in"
+
+#~ msgid "Bulk convert ebooks to LRF"
+#~ msgstr "Converteer meerdere e-boeken naar LRF"
+
+#~ msgid "Insert &blank lines between paragraphs"
+#~ msgstr "Voeg &blanco regels to tussen alinea's"
+
+#~ msgid "&Regular expression:"
+#~ msgstr "&Regexp:"
+
+#~ msgid "Edit meta information"
+#~ msgstr "Wijzig meta-informatie"
+
+#~ msgid ""
+#~ "The title for this recipe. Used as the title for any ebooks created from the "
+#~ "downloaded feeds."
+#~ msgstr ""
+#~ "De titel voor dit recept. Dit word gebruikt als titel voor alle e-boeken die "
+#~ "worden gemaakt van de gedownloade feeds."
+
+#~ msgid ""
+#~ "The directory in which to store the downloaded feeds. Defaults to the "
+#~ "current directory."
+#~ msgstr ""
+#~ "De map waarin de gedownloade feeds worden bewaards. Standaard: de huidige "
+#~ "map."
+
+#~ msgid ""
+#~ "Any link that matches this regular expression will be ignored. This option "
+#~ "can be specified multiple times, in which case as long as any regexp matches "
+#~ "a link, it will be ignored.By default, no links are ignored. If both --"
+#~ "filter-regexp and --match-regexp are specified, then --filter-regexp is "
+#~ "applied first."
+#~ msgstr ""
+#~ "Iedere link die overeenkomst met deze regexp zal worden overgeslagen. Deze "
+#~ "optie kan meerdere keren worden opgegeven, en als een van de uitdrukkingen "
+#~ "overeenkomst dan zal de link worden genegeerd. Standaard word geen enkele "
+#~ "link overgeslagen.  indien zowel --filter-regexp en --match-regexp worden "
+#~ "gebruikt, dan zal --filter-regexp allereerst worden toegepast."
+
+#~ msgid ""
+#~ "Specify the base font size in pts. All fonts are rescaled accordingly. This "
+#~ "option obsoletes the --font-delta option and takes precedence over it. To "
+#~ "use --font-delta, set this to 0. Default: %defaultpt"
+#~ msgstr ""
+#~ "Geet de basic lettergrootte in pts. Alls lettertypen worden overeenkomstig "
+#~ "vergroot. Deze optie vervangt de --font-delta optie. Om --fonot-delta te "
+#~ "gebruiken, zet het op 0. STandaard: %defaultpt"
+
+#~ msgid "The output directory. Default is the current directory."
+#~ msgstr "De uitvoer map. Standaard is de huidige map."
+
+#~ msgid "Character encoding for HTML files. Default is to auto detect."
+#~ msgstr "karakterkodering voor HTML bestanden. Standaard is auto detect."
+
+#~ msgid ""
+#~ "Create the output in a zip file. If this option is specified, the --output "
+#~ "should be the name of a file not a directory."
+#~ msgstr ""
+#~ "Genereer de uitvoer in een zip bestand. Als deze optie is gekozen, dan moet -"
+#~ "-output de naam van een bestand zijn, niet de map."
+
+#~ msgid "Set metadata of the generated ebook"
+#~ msgstr "Metadata van het gegenereerde e-boek"
+
+#~ msgid ""
+#~ "Set the author in the metadata of the generated ebook. Default is %default"
+#~ msgstr ""
+#~ "De auteur in de metadata van het gegenereerde e-boek. Standaard is %default"
+
+#~ msgid "Title for generated ebook. Default is to use the filename."
+#~ msgstr ""
+#~ "Titel voor gegenereerd e-boek. Standaard word de bestandsnaam gebruikt."
+
+#~ msgid ""
+#~ "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
+#~ msgstr ""
+#~ "Opties voor de configuratie van de conversie van comics (CBR, CBZ) bestanden "
+#~ "naar e-boek"
+
+#~ msgid ""
+#~ "<p>Could not convert %d of %d books, because no suitable source format was "
+#~ "found.<ul>%s</ul>"
+#~ msgstr ""
+#~ "<p>%d  van %d boeken kon niet worden geconverteerd, omdat geen schikbaar "
+#~ "bronformaat kon worden gevonden:<ul>%s</ul>"
+
+#~ msgid "Copying library to "
+#~ msgstr "Kopieer bibliotheek naar "
+
+#~ msgid "Choose a location for your ebook library."
+#~ msgstr "Kies een locatie voor de e-boek  bibliotheek"
+
+#~ msgid ""
+#~ "Remove spacing between paragraphs. Also sets a indent on paragraphs of "
+#~ "1.5em. You can override this by adding p {text-indent: 0cm} to --override-"
+#~ "css. Spacing removal will not work if the source file forces inter-paragraph "
+#~ "spacing."
+#~ msgstr ""
+#~ "Verwijderd spatiëring tussen de alinea's. Voegt eveneens een inspringen van "
+#~ "1,5em toe aan alinea's. je kan dit overschrijven door p {text-indent: 0cm} "
+#~ "toe te voegen aan --override-css. Het verwijderen van spatiëring tussen de "
+#~ "alinea's zal niet werken indien het bronbestand spatiëring dwingt tussen "
+#~ "alinea's."
+
+#~ msgid "The regular expression to use to remove the footer."
+#~ msgstr "De regexp te gebruiken om de voetnoot de verwijderen"
+
+#~ msgid "Use a regular expression to try and remove the footer."
+#~ msgstr ""
+#~ "Gebruik een regexp om te proberen de voetnoot te vinden en verwijderen."
+
+#~ msgid ""
+#~ "Do not force text to be justified in output. Whether text is actually "
+#~ "displayed justified or not depends on whether the ebook format and reading "
+#~ "device support justification."
+#~ msgstr ""
+#~ "Forceer geen tekst uitlijning in de uitvoer. Of de tekst al dan niet wordt "
+#~ "uitgelijnd hangt af van of het e-boek formaat en de gebruikte lees apparaat "
+#~ "al dan niet ijtlijning ondersteunen."
+
+#~ msgid "The regular expression to use to remove the header."
+#~ msgstr "De regexp die wordt gebruikt om de koptekst te verwijderen"
+
+#~ msgid "Use a regular expression to try and remove the header."
+#~ msgstr "Gebruik een regexp om te proberen de koptekst te verwijderen"
+
+#~ msgid "Output file. Default is derived from input filename."
+#~ msgstr ""
+#~ "Uitvoerbestand. Standaard wordt deze afgeleidt uit de invoerbestandsnaam."
+
+#~ msgid "Usage: ebook-convert INFILE OUTFILE [OPTIONS..]"
+#~ msgstr "Gebruik: e-boek-convert INVOER UITVOER [OPTIES..]"
+
+#~ msgid "Do not add a blank line between paragraphs."
+#~ msgstr "Voeg geen blanco regel in tussen alinea's."
+
+#~ msgid ""
+#~ "Specify the character encoding of the output document. The default is utf-8. "
+#~ "Note: This option is not honored by all formats."
+#~ msgstr ""
+#~ "Specificeer de karakterkodering van het uitvoerdocument. De standaard is utf-"
+#~ "8. Deze optie word niet door alle formaten nageleefd."
+
+#~ msgid "Header regular expression:"
+#~ msgstr "Koptekst regexp:"
+
+#~ msgid "Footer regular expression:"
+#~ msgstr "Voetnoot regexp:"
+
+#~ msgid "&Preprocess input file to possibly improve structure detection"
+#~ msgstr "&Voorbewerk invoerbestand voor mogelijk betere structuur detectie"
+
+#~ msgid "Use a wizard to help construct the XPath expression"
+#~ msgstr "Gebruik een wizard om te helpen een XPath uitdrukking te construeren"
+
+#~ msgid "Send specific format to storage card B"
+#~ msgstr "Stuur specifiek formaat naar opslag kaart B"
+
+#~ msgid "Send specific format to storage card A"
+#~ msgstr "Stuur specifiek formaat naar opslag kaart A"
+
+#~ msgid "Send specific format to main memory"
+#~ msgstr "Stuur specifiek formaat naar hoofdgeheugen"
+
+#~ msgid "Sent by email:"
+#~ msgstr "Verstuurd via e-mail:"
+
+#~ msgid "Failed to email the following books:"
+#~ msgstr "De volgende boeken konden niet worden ge-e-mailed:"
+
+#~ msgid ""
+#~ "Automatically create the author sort entry based on the current author entry"
+#~ msgstr ""
+#~ "Creër automatisch de sorteerauteur gebaseerd op de huidige auteur ingave"
+
+#~ msgid "Download &cover"
+#~ msgstr "Download &omslagafbeelding"
+
+#~ 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>Kon %s niet converteren.<p>Het is een e-boek met <A HREF=\"%s\">DRM</a>. "
+#~ "Je moet eerst de DRM verwijderen met externe programma's."
+
+#~ msgid "Ebook Viewer"
+#~ msgstr "e-boek Viewer"
+
+#~ 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 ""
+#~ "Als je de wordplayer e-boek applicatie gebruikt op je Android telefoon, dan "
+#~ "kan je de calibre boekencollectie direct op je telefoon bekijken. Om dit te "
+#~ "doen zul je de content server moeten inschakelen."
+
+#~ msgid "The author sort string"
+#~ msgstr "De sorteerauteur sleutel"
+
+#~ msgid "The series number"
+#~ msgstr "Het reeks nummer"
+
+#~ msgid "Password to access your calibre library. Username is "
+#~ msgstr ""
+#~ "Wachtwoord om toegang te verkrijgen tot je calibrebibliotheek. "
+#~ "Gebruikersnaam is "
+
+#~ msgid "The priority of worker processes"
+#~ msgstr "De prioriteit van werkprocessen"
+
+#~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
+#~ msgstr "Communiceer met de Sony PRS-300/505/500 e-boeklezer."
+
+#~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
+#~ msgstr "Communiceer met de Sony PRS-600/700/900 e-boeklezer."
+
+#~ 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 ""
+#~ "Hier kan je instellen hoe calibre je boeken bewaard wanneer je op de "
+#~ "verstuur naar apparaat knop drukt. Deze instelling kan worden genegeerd voor "
+#~ "bepaalde apparaten door de apparaat interface plugins in te stellen onder "
+#~ "voorkeuren -> plugins."
+
+#~ msgid ""
+#~ "The fields to output when cataloging books in the database.  Should be a "
+#~ "comma-separated list of fields.\n"
+#~ "Available fields: all, author_sort, authors, comments, cover, formats, id, "
+#~ "isbn, pubdate, publisher, rating, series_index, series, size, tags, "
+#~ "timestamp, title, uuid.\n"
+#~ "Default: '%default'\n"
+#~ "Applies to: CSV, XML output formats"
+#~ msgstr ""
+#~ "De velden om uit te voeren wanneer boeken in de database worden geindexeerd. "
+#~ "Komma gescheiden velden.\n"
+#~ "Beschikbare velden: all, author_sort, authors, comments, cover, formats, id, "
+#~ "isbn, pubdate, publisher, rating, series_index, series, size, tags, "
+#~ "timestamp, title, uuid.\n"
+#~ "Standaard: '%default'\n"
+#~ "Betreft: CSV, XML uitvoerformaten"
+
+#~ msgid "Tags to exclude as genres (regex):"
+#~ msgstr "Labels te vermeiden als genres (regexp):"
+
+#~ msgid "Create catalog of books in your calibre library"
+#~ msgstr "Maak catalogus van boeken in je calibrebibliotheek"
+
+#~ 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: CSV, XML output formats"
+#~ msgstr ""
+#~ "De velden voor de uitvoer van catalogus van boeken in de database. komma-"
+#~ "gescheiden lijst met velden.\n"
+#~ "Beschikbare velden: %s\n"
+#~ "Standaard: '%%default'\n"
+#~ "Betrekking tot: CSV, XML uitvoerformaten"
+
+#~ msgid ""
+#~ "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n"
+#~ "Default: '%default'\n"
+#~ "Applies to: ePub, MOBI output formats"
+#~ msgstr ""
+#~ "Label prefix voor gebruiker notities, bv. '*Misschien vindt Jeff dit een "
+#~ "leuk boek'\n"
+#~ "Standaard: '%default'\n"
+#~ "Betrekking tot: ePub, MOBI uitvoerformaten"
+
+#~ 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 ""
+#~ "Bewaar de uitvoer van verschillende stadia van het conversie proces in de "
+#~ "opgegeven map. Handig als je niet zeker weet wanneer fouten optreden tijdens "
+#~ "de conversie.\n"
+#~ "Standaard: '%default'None\n"
+#~ "Betrekking tot: ePub, MOBI uitvoerformaten"
+
+#~ msgid "Automatically number books in this series"
+#~ msgstr "Nummer de boeken in deze reeks automatisch"
+
+#~ msgid "Send specific format"
+#~ msgstr "Verstuur specifiek formaat"
+
+#~ 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 ""
+#~ "De waarde <b>%d</ b> die je hebt gekozen voor de server-poort is een systeem-"
+#~ "poort. Uw besturingssysteem kan het gebruik van deze poort blokkeren en "
+#~ "voorkomen dat de server op deze poort draait. Het is veiliger te kiezen voor "
+#~ "een poortnummer groter dan 1024."
+
+#~ msgid ""
+#~ "The changes you made require that Calibre be restarted. Please restart as "
+#~ "soon as practical."
+#~ msgstr ""
+#~ "De door je aangebrachte wijzigingen vereisen dat Calibre opnieuw opgestart "
+#~ "moet worden. Herstart zo spoedig mogelijk."
+
+#~ 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 ""
+#~ "Geselecteerde boeken worden automatisch genummerd,\n"
+#~ "in de volgorde waarin u ze geselecteerd hebt.\n"
+#~ "Dus als je u eerst boek A en daarna boek B selecteerd,\n"
+#~ "dan zal Boek A nr 1 en boek B nr 2 in de reeks krijgen."
+
+#~ msgid ""
+#~ "&Location of ebooks (The ebooks are stored in maps sorted by author and "
+#~ "metadata is stored in the file metadata.db)"
+#~ msgstr ""
+#~ "&Locatie van de e-boeken. (De e-boeken zijn opgeslagen in de mappen "
+#~ "gesorteerd op auteur, en metadata word bewaard in eht bestand metadata.db)"
+
+#~ msgid ""
+#~ "No metadata found, try adjusting the title and author or the ISBN key."
+#~ msgstr ""
+#~ "Geen metagegevens gevonden, probeer een andere titel en auteur of een ander "
+#~ "ISBN-nummer."
+
+#~ msgid ""
+#~ "Regular expression: the expression must match anywhere in the metadata"
+#~ msgstr "Regexp: de uitdrukking moet ergens in de metagegevens voorkomen"
+
+#~ 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 ""
+#~ "Indien aangevinkt zal een collectie op het apparaat niet worden verwijderd, "
+#~ "ook al is er een boek met gewijzigde metadata aanwezig en de collectie is "
+#~ "daarin niet in aanwezig. Tevens zal de mogelijkheid om collecties aan te "
+#~ "passen in de apparaat weergave worden mogelijk gemaakt. Indien niet "
+#~ "aangevinkt zullen de collecties op het apparaat steeds overeenkomen met de "
+#~ "metadata in de calibrebibliotheek."
+
+#~ 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 versturen</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 calibrebibliotheek bij iedere connectie met "
+#~ "het apparaat.</li></ul>"
+
+#~ 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"
+#~ "Default: '%default'\n"
+#~ "Applies to: ePub, MOBI output formats"
+#~ msgstr ""
+#~ "Komma-gescheiden lijst van tag woorden die aangeeft dat het boek uit de "
+#~ "uitvoer moet gehouden worden.  Neit hoofdletter gevoelig.\n"
+#~ "--exclude-tags=skip komt overeen met 'skip this book' en 'Skip will like "
+#~ "this'\n"
+#~ "Standaard: '%default'\n"
+#~ "Is van toepassing op: ePub, MOBI uitvoerformaten"
+
+#~ msgid ""
+#~ "This command rebuilds your calibre database from the information stored by "
+#~ "calibre in the OPF files.<p>This function is not currently available in the "
+#~ "GUI. You can recover your database using the 'calibredb restore_database' "
+#~ "command line function."
+#~ msgstr ""
+#~ "Deze actie maakt de calibrebibliotheek opnieuw vanaf de informatie die is "
+#~ "opgeslagen in de OPF bestanden.<p>Deze functie is (nog) niet beschikbaar in "
+#~ "de GUI. Je kunt de database herstellen door 'calibredb restore_database\" te "
+#~ "gebruiken met de CLI."
+
+#~ msgid ""
+#~ "<b>You can destroy your library using this feature.</b> Changes are "
+#~ "permanent. There is no undo function.  This feature is experimental, and "
+#~ "there may be bugs. You are strongly encouraged to back up your library "
+#~ "before proceeding.<p>Search and replace in text fields using character "
+#~ "matching or regular expressions. "
+#~ msgstr ""
+#~ "<b>Je kunt je bibliotheek met deze functie kapot maken.</b> Veranderingen "
+#~ "zijn permanent. Je kunt niet ongedaan maken. Deze functie is experimenteel "
+#~ "en er kunnen fouten optreden. Je wordt sterk aangeraden eerst een backup van "
+#~ "je bibliotheek te maken voor je verder gaat.<p>Zoek en vervang in "
+#~ "tekstvelden met karaktercombinaties of regexps. "
+
+#~ msgid "Clear series"
+#~ msgstr "Verwijder reeks"
+
+#~ msgid "Read %s in the %s format"
+#~ msgstr "Lees %s in het %s-formaat"
+
+#~ 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 ""
+#~ "Normaal gesproken behandelt calibre blanco regels als paragraaf markering. "
+#~ "Met deze optie zal het aannemen dat iedere regel die begint met een "
+#~ "indentatie (een tab, of twee of meer spaties) een paragraaf voorstelt. "
+#~ "alinea's eindigen wanneer de volgende lijn met een indentatie word bereikt."
+
+#~ msgid ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'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;\">Set a regular expression "
+#~ "pattern to use when trying to guess ebook metadata from filenames. </p>\n"
+#~ "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">A <a "
+#~ "href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
+#~ "decoration: underline; color:#0000ff;\">reference</span></a> on the syntax "
+#~ "of regular expressions is available.</p>\n"
+#~ "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" "
+#~ "font-weight:600;\">Test</span> functionality below to test your regular "
+#~ "expression on a few sample filenames. The group names for the various "
+#~ "metadata entries are documented in tooltips.</p></body></html>"
+#~ msgstr ""
+#~ "<!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;\">Geef een reguliere "
+#~ "uitdrukking patroon op om te gebruiken bij  het raden van e-boek "
+#~ "metagegevens gebaseerd op bestandsnamen.</p>\n"
+#~ "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">Een <a "
+#~ "href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
+#~ "decoration: underline; color:#0000ff;\">referentie</span></a> betreffende de "
+#~ "syntax voor regexps is beschikbaar.</p>\n"
+#~ "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">Gebruik de <span style=\" "
+#~ "font-weight:600;\">Test</span> functionaliteit hieronder om de reguliere "
+#~ "uitdrukking uit te proberen op een aantal test bestandsnamen. De groepnamen "
+#~ "voor de diverse metadata velden zijn gedocumenteerd onder "
+#~ "tooltips.</p></body></html>"
+
+#~ 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 "
+#~ "map directly."
+#~ msgstr ""
+#~ "De volgende boeken hadden formaten in de database die niet beschikbaar zijn. "
+#~ "De opgaves voor deze formaten zijn verwijderd. Je zult deze handmatig moeten "
+#~ "nakijken. Dit kan gebeuren als je de bestanden in de mappen zelf hebt "
+#~ "aangepast."
+
+#~ msgid ""
+#~ "The following books had formats or covers listed in the database that are "
+#~ "not actually available. The entries for the formats/covers have been "
+#~ "removed. You should check them manually. This can happen if you manipulate "
+#~ "the files in the library map directly."
+#~ msgstr ""
+#~ "Deze boeken hadden formaten of omslagen opgeslagen in de database die niet "
+#~ "echt beschikbaar zijn. De ingangen voor de formaten/omslagen zijn "
+#~ "verwijderd. Je zou ze handmatig moeten controleren. Dit kan ontstaan als je "
+#~ "bestanden wijzigt in de mappen zelf."
diff --git a/src/calibre/translations/oc.po b/src/calibre/translations/oc.po
index 8d0550b386..7837833ea4 100644
--- a/src/calibre/translations/oc.po
+++ b/src/calibre/translations/oc.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-05-21 07:14+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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: 2011-03-27 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Fa estrictament pas res"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Fa estrictament pas res"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Fa estrictament pas res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Fa estrictament pas res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Fa estrictament pas res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Fa estrictament pas res"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Fa estrictament pas res"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Fa estrictament pas res"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Basa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tipe de fichièr"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Lector de metadonadas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Editor de metadonadas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generador de catalòg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Moduls extèrnes desactivats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Nòvas"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr "Comunica amb lo lector d'ebook Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/pa.po b/src/calibre/translations/pa.po
index 64121767ce..37a0c96961 100644
--- a/src/calibre/translations/pa.po
+++ b/src/calibre/translations/pa.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-02-13 04:56+0000\n"
 "Last-Translator: Aalam Rangi <Unknown>\n"
 "Language-Team: Punjabi <pa@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: 2011-03-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr ""
 msgid "Unknown"
 msgstr "ਅਗਿਆਤ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "ਫਾਇਲ ਦੀ ਕਿਸਮ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "ਮੈਟਾ-ਡਾਟਾ ਰੀਡਰ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "ਮੈਟਾ-ਡਾਟਾ ਰਾਈਟਰ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "ਕੈਟਾਲੌਗ ਜੈਨੇਰੇਟਰ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "ਤਰਜੀਹਾਂ"
@@ -325,8 +325,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "ਟੂਲਬਾਰ ਨੂੰ ਆਪਣੀ ਪਸੰਦ ਮੁਤਾਬਿਕ ਬਦਲੋ"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -651,35 +651,31 @@ msgstr "ਇਹ ਪ੍ਰੋਫਾਇਲ B&N Nook Color ਲਈ ਹੈ"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "ਇਹ ਪ੍ਰੋਫਾਇਲ Sanda Bambook ਲਈ ਹੈ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -687,29 +683,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -731,106 +727,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -874,20 +882,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -895,8 +903,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -906,8 +914,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -915,17 +923,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1224,32 +1232,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1258,29 +1266,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1413,7 +1432,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2050,7 +2069,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2165,7 +2184,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2176,6 +2195,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2525,105 +2548,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3006,7 +3029,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3139,7 +3162,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3305,6 +3328,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3569,135 +3593,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3905,8 +3933,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4103,7 +4131,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4169,7 +4197,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4177,7 +4205,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4358,7 +4386,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4366,32 +4394,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4478,26 +4506,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4505,7 +4533,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4517,7 +4545,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4528,19 +4556,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4605,7 +4633,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4847,7 +4875,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5049,8 +5077,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5060,17 +5088,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5080,25 +5108,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5156,7 +5184,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5179,14 +5207,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5751,10 +5779,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6346,7 +6378,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6931,97 +6963,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7307,7 +7339,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7443,7 +7475,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7490,8 +7522,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7523,12 +7555,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7712,22 +7744,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9207,12 +9239,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9281,7 +9313,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9516,61 +9548,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9584,67 +9616,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9852,48 +9902,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9968,7 +10018,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9985,12 +10035,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10796,25 +10846,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10826,91 +10883,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10919,22 +10976,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10944,64 +11001,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11732,30 +11785,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11852,7 +11909,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11945,166 +12002,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12114,60 +12171,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12240,34 +12297,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12467,7 +12524,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12545,36 +12602,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12650,73 +12707,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12791,27 +12848,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13977,11 +14034,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13995,15 +14052,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15040,101 +15097,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15243,3 +15300,6 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid "Do not download CSS stylesheets."
 msgstr ""
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "ਟੂਲਬਾਰ ਨੂੰ ਆਪਣੀ ਪਸੰਦ ਮੁਤਾਬਿਕ ਬਦਲੋ"
diff --git a/src/calibre/translations/pl.po b/src/calibre/translations/pl.po
index 8fc8568ce9..cde4893fd7 100644
--- a/src/calibre/translations/pl.po
+++ b/src/calibre/translations/pl.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-29 10:16+0000\n"
-"Last-Translator: Johnny J <Unknown>\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-06 09:49+0000\n"
+"Last-Translator: Sebastian Pućko <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-30 04:36+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-07 04:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Ta opcja zupełnie nic nie zmienia"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Baza"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Dostosuj"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Nie można konfigurować"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Typ pliku"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Czytnik metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Zapisywanie metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generator katalogu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Akcja interfejsu użytkownika."
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferencje"
@@ -336,8 +336,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Dodaj/usuń swoje kolumny do/z listy książek"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Dostosuj pasek narzędzi"
+msgid "Toolbar"
+msgstr "Pasek narzędzi"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -348,8 +348,8 @@ msgstr ""
 "nich dostępne"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Dostosuj wyszukiwanie"
+msgid "Searching"
+msgstr "Szukanie"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -686,35 +686,31 @@ msgstr "Ten profil przeznaczony jest dla urządzenia B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Ten profil przeznaczony jest dla urządzenia Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Zainstalowane wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapowanie wtyczek dla róznych typów plików"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Lokalne dostosowanie wtyczek"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Wyłączone wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Włączone wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Nie znaleziono wtyczki w "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicjowanie wtyczki %s nie udało się – prześledź komunikaty:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -726,16 +722,16 @@ msgstr ""
 "    Dostosuj calibre poprzez załadowanie zewnętrznych wtyczek.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Dodaj wtyczkę podając ścieżkę do pliku, który ją zawiera."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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 wbudowane wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -743,15 +739,15 @@ msgstr ""
 "Dostosuj wtyczkę. Wprowadź nazwę wtyczki i polecenie dostosowujące "
 "oddzielając je przecinkiem."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Wyświetl wszystkie zainstalowane wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Włącz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Wyłącz wtyczkę"
 
@@ -775,43 +771,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Umożliwia komunikację z telefonami S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr "Wyłącz sterownik Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr "Włącz sterownik Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Używaj cyklu jako kategorii w iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr "Włącz używanie nazwę cykli tak jak iTunes Genre, iBooks Category"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Przechowuj okładki z iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr "Włącz cache'owanie i wyświetlanie okładek z iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr "Pomiń rekomendację 'Podłącz do iTunes'"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr "Włącz pomijanie okna rekomendacji 'Podłącz do iTunes'"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Urządzenie Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Umożliwia komunikację z aplikacjami iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Wykryto urządzenie Apple, uruchamianie iTunes, proszę czekać..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -819,27 +827,27 @@ msgstr ""
 "Nie można skopiować książek bezpośrednio z iUrządzenia. Przeciągnij z "
 "Biblioteki iTunes na Pulpit, a następnie dodaj do Biblioteki Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Uaktualnianie listy metadanych..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d z %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "zakończone"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -849,7 +857,7 @@ msgstr ""
 "Usuwam używając aplikacji iBooks.\n"
 "Kliknij 'Pokaż szczegóły', aby zobaczyć listę."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -857,31 +865,31 @@ 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:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Newsy"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Umożliwia komunikację z aplikacją iTunes"
 
@@ -932,20 +940,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 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/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Przenoszenie książek na urządzenie..."
 
@@ -953,8 +961,8 @@ msgstr "Przenoszenie książek na urządzenie..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Dodawanie książek do listy metadanych urządzenia..."
 
@@ -964,8 +972,8 @@ msgstr "Dodawanie książek do listy metadanych urządzenia..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Usuwanie książek z urządzenia..."
 
@@ -973,17 +981,17 @@ msgstr "Usuwanie książek z urządzenia..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Usuwanie książek z listy metadanych urządzenia..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Przesyłanie metadanych do urządzenia..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Nie ma zainstalowanego programu Bambook SDK"
 
@@ -1299,15 +1307,15 @@ msgstr "Umożliwia komunikację z czytnikiem książek Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Umożliwia komunikację ze wszystkimi czytnikami książek Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Wszystkie według tytułu"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Wszystkie według autora"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1315,7 +1323,7 @@ msgstr ""
 "Lista oddzielonych przecinkami pól metadanych do włączenia do zbiorów w "
 "urządzeniu. Możliwości obejmują: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1324,11 +1332,11 @@ msgstr ""
 ". Dwie specjalne kolekcje są dostępne: %s:%s i %s:%s. Dodaj te wartości do "
 "listy, aby je aktywować. Nazwy kolekcji muszą być poprzedzone znakiem \":\"."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Załaduj osobne miniaturki okładek książek (dla nowszych czytników)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1342,14 +1350,14 @@ msgstr ""
 "inaczej zmienić okładki. OSTRZEŻENIE: Ta opcja powinna być tylko używana z "
 "następującymi modelami czytnika SONY: 350, 650, 950 i nowsze."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Odśwież oddzielne okładki podczas korzystania z automatycznego zarządzania "
 "(nowsze czytniki)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1359,11 +1367,11 @@ msgstr ""
 "urządzenia. Wyłącz tę opcję jeśli masz dużo książek w czytniku i powoduje "
 "ona zbyt wolne działanie."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Zachowaj proporcje obrazu przy tworzeniu miniatur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1373,6 +1381,21 @@ msgstr ""
 "obrazu (szerokość do wysokości) co okładki. Odznacz ją jeśli chcesz aby "
 "miniatury miały maksymalny rozmiar, ignorując proporcje obrazu."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr "Szukaj książek we wszystkich folderach"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+"Ustawienie tej opcji pozwoli Calibre na szukanie książek we wszystkich "
+"folderach na urządzeniu i jego karcie pamięci. Pozwala to Calibre znaleźć "
+"książki wprowadzone do urządzenia przez inne oprogramowanie oraz pobrane "
+"bezprzewodowo."
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1511,7 +1534,7 @@ msgstr "Dodatkowa personalizacja"
 msgid "Communicate with an eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Pobierz informacje o urządzeniu..."
 
@@ -2358,7 +2381,7 @@ msgstr "Konwertuję plik źródłowy na plik HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Wykonywanie przekształceń na książce..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Tworzenie"
 
@@ -2516,7 +2539,7 @@ msgstr "Rozpocznij"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Nie wstawiaj spisu treści na początku książki."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2534,6 +2557,10 @@ msgstr ""
 "Treści\" (włącz \"Wymuś wykorzystanie automatycznego tworzenia Spisu "
 "Treści\")."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2934,105 +2961,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "BŁĄD SZABLONU"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Nie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Tak"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Tytuł"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(rzy)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Wydawca"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Komentarze"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etykiety"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Cykl"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Język"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Data"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Opublikowano"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Uprawnienia"
 
@@ -3474,7 +3501,7 @@ msgstr "UK"
 msgid "Amazon timed out. Try again later."
 msgstr "Upłynął czas zapytania Amazon. Spróbuj ponownie później."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Źródło metadanych"
 
@@ -3613,7 +3640,7 @@ msgid "HTML TOC generation options."
 msgstr "Opcje generowania spisu treści w HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3813,6 +3840,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Temat"
 
@@ -4163,88 +4191,92 @@ msgstr ""
 "z opcją txt-output-formatting ponieważ linki są zawsze usuwane przy formacie "
 "wyjściowym zwykłego tekstu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Wyślij plik do karty pamięci zamiast domyślnie ustawionej głównej pamięci."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Potwierdź przed usunięciem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Struktura głównego okna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Powiadom mnie, gdy dostępna jest nowa wersja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Używaj liczb rzymskich do numerowania cyklu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Sortuj etykiety według nazwy, popularności lub oceny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Liczba okładek wyświetlanych w trybie przeglądania okładek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Domyślne wartości dla konwersji do LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opcje dla czytnika LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Lista formatów które będą otwierane w wewnętrznej przeglądarce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Kolumny wyświetlane na liście książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Automatycznie włączaj serwer zawartości przy starcie aplikacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Najstarsze newsy przechowywane w bazie danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Pokaż ikonę w zasobniku systemowym"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Prześlij pobrane newsy na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Usuń książki z biblioteki po przesłaniu ich na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "Pokazuj okładki w oddzielnym oknie, zamiast w głównym oknie calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Zablokuj powiadomienia z ikony w zasobniku systemowym"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Domyślne działanie do wykonania, gdy został kliknięty przycisk przesyłania "
 "na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4252,7 +4284,7 @@ msgstr ""
 "Zacznij szukać w momencie pisania. Jeśli wyłączone - wyszukiwanie nastąpi "
 "tylko po naciśnięciu klawisza Enter lub Return."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
@@ -4262,45 +4294,45 @@ msgstr ""
 "pokazywania tylko trafionych rezultatów. Możesz użyć N lub F3 aby przejść do "
 "następnego trafienia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maksymalna liczba oczekujących zadań"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Pobierz metadane społecznościowe (etykiety/oceny/itd.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Nadpisz autora i tytuł z nowych metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Automatycznie pobieraj pliki okładek, jeśli są dostępne w internecie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 "Ogranicz maksymalną liczbę jednocześnie przetwarzanych zadań do liczby rdzeni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Wygląd interfejsu użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Pokaż średnie oceny pozycji w wyszukiwarce znaczników"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Zablokuj animacje UI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "kategorie wyszukiwarki znaczników, które mają być pominięte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Wybierz pliki"
 
@@ -4519,8 +4551,8 @@ msgstr "Użyj tylko adnotacji wygenerowanych na podstawie biblioteki"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nie wybrano ksiązek"
@@ -4725,7 +4757,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4798,7 +4830,7 @@ msgid "Bulk convert"
 msgstr "Masowa konwersja"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Nie można przekonwertować"
 
@@ -4806,7 +4838,7 @@ msgstr "Nie można przekonwertować"
 msgid "Starting conversion of %d book(s)"
 msgstr "Rozpoczynam konwersję %d książki(ek)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "Plik wyjściowy pusty, prawdopodobnie proces konwersji się wysypał"
 
@@ -4997,7 +5029,7 @@ msgid "Stop Content Server"
 msgstr "Zatrzymaj Serwer Zawartości (Content Server)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Prześlij emailem do"
 
@@ -5005,32 +5037,32 @@ msgstr "Prześlij emailem do"
 msgid "Email to and delete from library"
 msgstr "Prześlij pocztą i usuń z biblioteki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(skasuj z biblioteki)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Ustaw adres email przeznaczony do dzielenia się książkami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Prześlij na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Połącz/udostępnij"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Zatrzymywanie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "Zatrzymuję serwer, to może zająć minutkę, proszę czekać..."
@@ -5117,20 +5149,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Ściąganie {0} dla {1} książki/ek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Nie można edytować metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Nie można połączyć książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5138,7 +5170,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5150,7 +5182,7 @@ msgstr ""
 "połączony.<br><br> Druga i pozostałe wybrane książki nie zostaną skasowane "
 "ani zmienione.<br><br>Potwierdź chęć kontynuacji."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5171,7 +5203,7 @@ msgstr ""
 "<b>usunięte</b> z twojej biblioteki calibre.<br><br>Jesteś <b>pewien</b>, że "
 "chcesz kontynuować?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5189,19 +5221,19 @@ msgstr ""
 "wskazanych książkach zostaną całkowicie <b>usunięte</b> z twojej biblioteki "
 "calibre.<br><br>Jesteś <b>pewien</b>, że chcesz kontynuować?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Pobierz newsy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Pobieranie newsów z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " - pobrano."
 
@@ -5266,7 +5298,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Uruchom kreatora ustawień wstępnych"
 
@@ -5517,7 +5549,7 @@ msgid "The specified directory could not be processed."
 msgstr "Wybrany folder nie może być przetworzony."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Brak książek"
 
@@ -5736,8 +5768,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Ścieżka"
 
@@ -5747,17 +5779,17 @@ msgstr "Ścieżka"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formaty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Kolekcje"
 
@@ -5767,25 +5799,25 @@ msgid "Click to open"
 msgstr "Kliknij, aby otworzyć"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Brak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Wklej okładkę"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Skopiuj okładkę"
 
@@ -5843,7 +5875,7 @@ msgstr "wyjście"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5866,14 +5898,14 @@ msgstr "wyjście"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6466,10 +6498,14 @@ msgstr "Nie wstawiaj &spisu treści na początku książki."
 msgid "FB2 Output"
 msgstr "Wyjściowy FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Sekcjonuj:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr "Gatunek"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Kreator przeskalowywania czcionek"
@@ -7097,7 +7133,7 @@ msgid "Regex:"
 msgstr "Wyrażenie regularne:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7713,21 +7749,21 @@ msgstr "Błąd"
 msgid "Error communicating with device"
 msgstr "Błąd podczas komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Brak odpowiednich formatów"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Ustaw folder do otwarcia jako urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Błąd komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7735,69 +7771,69 @@ 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Urządzenie: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " wykryte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /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:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i z %i Książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 z %i Książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 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:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Brak urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 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:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Brak karty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Trwa wysyłanie katalogów do urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Przesyłanie newsów na urządzenie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Wysyłanie książek do urządzenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7806,11 +7842,11 @@ msgstr ""
 "znaleziono odpowiedniego formatu. Najpierw skonwertuj książkę(-i) do formatu "
 "obsługiwanego przez twoje urządzenie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Brak miejsca na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -8199,7 +8235,7 @@ msgstr "Wybierz format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -8339,7 +8375,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Anuluj"
 
@@ -8388,8 +8424,8 @@ msgid "Location"
 msgstr "Lokalizacja"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8428,12 +8464,12 @@ msgid "Author sort"
 msgstr "Sortowanie autora"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Błędna nazwa autora"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Nazwy autorów nie mogą zawierać znaków &."
 
@@ -8635,22 +8671,22 @@ msgid "Working"
 msgstr "Zajęty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Małe litery"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Wielkie litery"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Wielkość liter w tytule"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Ustaw kapitaliki"
 
@@ -10311,12 +10347,12 @@ msgid "%s (was %s)"
 msgstr "%s (był %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Element jest pusty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "Element nie może zostać ustawiony jako pusty. Po prostu go usuń."
 
@@ -10387,7 +10423,7 @@ msgid "Send test mail from %s to:"
 msgstr "Wyślij testowy email z %s na:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -10642,65 +10678,65 @@ msgstr "Błąd pobierania"
 msgid "Failed to download from %r with error: %s"
 msgstr "Nie powiodło się pobieranie %r z błędem: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Email %s do %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Newsy:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "W załączeniu przesyłam %s czasopism pobranych przez calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "W załączniku znajdziesz e-booka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "przez"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "w formacie %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Wysyłanie wiadomości do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Dokonać automatycznej konwersji następujących książek przed wysłaniem ich "
 "emailem?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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 emailem, ponieważ nie "
 "znaleziono odpowiednich formatów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Nie udało się wysłać emailem książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "wysłano"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Wysyłaj newsy do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10724,67 +10760,85 @@ msgstr ""
 "dołączyć rozszerzenie pliku). Nazwy grup dla różnych wpisów metadanych są "
 "udokumentowane we wskazówkach narzędziowych.</p></div>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Wyrażenie &regularne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Nazwa pliku:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Wyrażenie regularne (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Brak wyników"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autorzy:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Wyrażenie regularne (?P<autor>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Cykl:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Wyrażenie regularne (?P<cykl>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Spis cykli:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Wyrażenie regularne (?P<indeks_cyklu>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Wyrażenie regularne (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr "Udostępnił:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr "Opublikowane:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Przeglądarka okładek"
@@ -10998,48 +11052,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Modyfikuj szablon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Rozmiar (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Książka %s z %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Poszukiwana nazwa to \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "UUID tej książki to \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "W bibliotece"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Rozmiar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Oznaczone do usunięcia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Kliknij dwa razy, aby rozpocząć <b>edycję</b><br><br>"
 
@@ -11116,7 +11170,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Nie znaleziono wyników</b> dla szukanej frazy <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Brak pasujących wyników"
 
@@ -11133,12 +11187,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Pasek narzędzi przeglądarki LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Następna strona"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Poprzednia strona"
 
@@ -12035,19 +12089,26 @@ msgstr "&Ustaw jako domyślny"
 msgid "&Remove email"
 msgstr "&Usuń email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Wysyłaj automatycznie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "E-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Formaty emaila. Pierwszy pasujący format zostanie wysłany."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -12055,7 +12116,7 @@ msgstr ""
 "Jeśli zaznaczone, pobrane newsy zostaną automatycznie wysłane <br> na ten "
 "adres (pod warunkiem że jest w jednym z wyświetlonych formatów)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "nowy adres email"
 
@@ -12067,96 +12128,96 @@ msgstr "Wąski"
 msgid "Wide"
 msgstr "Szeroki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Średnie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Małe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Duże"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Zawsze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nigdy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Od pierwszej litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Podzielone na partycje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "&Układ interfejsu użytkownika (wymaga ponownego uruchomienia):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Liczba wyświetlanych okładek w trybie przeglądarki (wymaga ponownego "
 "uruchomienia):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Wybierz &język (wymaga ponownego uruchomienia):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Pokaż &średnie oceny w przeglądarce etykiet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Zablokuj wszystkie animacje. Przydatne, jeśli masz wolny/stary komputer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Zablokuj &animacje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Aktywuj ikonę w &zasobniku systemowym (wymaga ponownego uruchomienia)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Pokaż planszę &startową podczas uruchomienia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Wyłącz powiadomienia w zasob&niku systemowym"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Użyj numeracji rzymskiej dla cykli"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Pokaż &przeglądarkę okładek w nowym oknie (wymaga ponownego uruchomienia)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr "Metoda kategorii partycjonowania przeglądarki etykiet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -12170,11 +12231,11 @@ msgstr ""
 "partycjonowane, aby uzyskać listę grup o określonym rozmiarze.\n"
 "Wybierz wyłącz, aby nie oglądać podkategorii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr "Schowaj gdy wystąpi więcej elementów niż:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -12185,11 +12246,11 @@ msgstr ""
 "na podkategorie. Jeśli metoda partycjonowania jest wyłączona, ta wartość jes "
 "ignorowana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr "Kategorie z elementami hierarchicznymi:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -12207,52 +12268,48 @@ msgstr ""
 "'Tajemnice'. Jeśli 'etykeity' nie znajdą się w tym polu, wówczas etykiety\n"
 "zostaną wyświetlone każda we własnym wierszu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Pasek narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Rozmiar ikon:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Pokaż &tekst pod ikonami:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "Podziel pa&sek narzędzi na dwa paski"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Czcionka interfejsu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Zmień czcionkę (wymaga ponownego uruchomienia)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Zastosuj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Przywróć ustawienia &domyślne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Zapisz zmiany"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Anuluj i wróć do omówienia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Przywracanie wartości domyślnych nie jest wspierane dla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -12260,7 +12317,7 @@ msgstr ""
 "Niektóre ze zmian wymagają ponownego uruchomienia. Proszę jak najszybciej "
 "ponownie uruchomić calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -12269,7 +12326,7 @@ msgstr ""
 "programu calibre. Nie można zmieniać żadnych dalszych preferencji bez "
 "uprzedniego ponownego uruchomienia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Wymagane ponowne uruchomienie"
@@ -13189,30 +13246,34 @@ msgid "The main toolbar"
 msgstr "Główny pasek narzędzi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr "Opcjonalny drugi pasek narzędzi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Główny pasek narzędzi gdy urządzenie jest podłączone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Menu kontekstowe dla książek w bibliotece calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Menu kontekstowe dla książek na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Nie można dodać"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Nie można dodać akcji %s do tej lokalizacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Nie mogę usunąć"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Nie mogę usunąć akcji %s z tej lokalizacji"
 
@@ -13320,7 +13381,7 @@ msgstr "Zastosuj wszystkie zmiany, których dokonałeś do tego ulepszenia"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Szukaj"
@@ -13415,167 +13476,167 @@ msgstr "Kliknij, by zmienić"
 msgid "&Alternate shortcut:"
 msgstr "&Alternatywny skrót:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Zmień nazwę %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr "Edytuj sortowanie dla %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr "Dodaj %s do kategorii użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr "Dzieci %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr "Skasuj wyszukiwania %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr "Usuń %s z kategorii %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Szukaj %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "Szukaj wszystkiego oprócz %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr "Dodaj podkategorię do %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr "Skasuj kategorię użytkownika %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Ukryj kategorię %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Wyświetl kategorię"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Szukaj książek w kategorii %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "Szukaj książek nie w kategorii %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Zarządzaj %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Zarządzaj zapisanymi wyszukaniami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Zarządzaj kategoriami użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Wyświetl wszystkie kategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Zmień schemat pod-kategoryzacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr "Nazwa zgrupowanego wyszukiwania to \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr "Zmiana autorów dla kilku książek może chwilę zająć. Jesteś pewien?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr "Zmiana metadanych dla tylu książek może chwilę zająć. Jesteś pewien?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Wyszukiwania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr "Zmień kategorię użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 "Nie możesz używać okresów w nazwie podczas zmiany nazwy kategorii użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr "Nazwa %s już jest w użyciu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Powtórzona nazwa wyszukania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "Nazwa zapisanego wyszukania %s jest już używana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr "Nowa kategoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr "Skasuj kategorię użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr "%s nie jest kategorią użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr "%s zawiera elementy. Naprawdę chcesz skasować?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr "Usuń kategorię"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr "Kategoria użytkownika %s nie istnieje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr "Dodaj do kategorii użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr "Kategoria użytkownika %s nie istnieje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Znajdź element w przeglądarce elementów"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13596,64 +13657,64 @@ msgstr ""
 "elementy\n"
 "zawierające tekst \"foo\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "Znajdź"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Znajdź pierwszą/kolejną pasującą pozycję"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Zwiń wszystkie kategorie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "Brak dalszych trafień.</b><p> Kliknij Szukaj ponownie, aby znaleźć pierwsze "
 "trafienie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Sortuj wg nazwy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Sortuj wg popularności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Sortuj wg średniej oceny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Ustaw porządek sortowania dla wpisów w przeglądarce etykiet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Dopasuj wszystkie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Dopasuj którykolwiek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Przy wybraniu wielu wpisów w przeglądarce etykiet dopasuj jakiekolwiek lub "
 "wszystkie z nich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Zarządzaj kategoriami &użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Dodaj swoje własne kategorie do Przeglądarki etykiet"
 
@@ -13733,24 +13794,24 @@ msgstr ""
 "debugowania będzie dostępny w pliku: %s<p> Log zostanie automatycznie "
 "wyświetlony."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Źródło wyłączone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Nie powiodło się</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Niektóre zadania są aktywne. Jesteś pewien, że chcesz zamknąć program?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13760,11 +13821,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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Aktywne zadania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13973,7 +14034,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opcje odpowiedzialne za personalizacje przeglądarki książek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Zapamiętaj ostatnio użyty rozmiar okienka"
 
@@ -14059,36 +14120,36 @@ msgstr ""
 "Jesteś w trakcie edycji skrótu klawiaturowego, zakończ to klikając poza pole "
 "edycji skrótu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "Sprawdź w słowniku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Przejdź do..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Następna sekcja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Poprzednia sekcja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Początek dokumentu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Koniec dokumentu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Początek sekcji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Koniec sekcji"
 
@@ -14165,77 +14226,77 @@ msgstr "Podgląd wydruku"
 msgid "Clear list of recently opened books"
 msgstr "Wyczyść listę ostatnio otwieranych książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Łączenie z dict.org by sprawdzić: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Wybierz książkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Nie znalezniono wyników dla: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Ładuję strumień..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Zestawiam %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Zakładka #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Dodaj zakładkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Dodaj tytuł zakładki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Ładowanie książki..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Nie można otworzyć książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opcje odpowiadające za kontrolę nad przeglądarką książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Jeśli określone, okno przeglądarki spróbuje pokazać się na wierzchu podczas "
 "startu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Jeśli określone, okno przeglądarki spróbuje otworzyć się na pełnym ekranie "
 "podczas startu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Wyświetlaj uwagi javascriptu i wiadomości konsolowe w konsoli"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -14313,27 +14374,27 @@ msgstr "Znajdź poprzednie wystąpienie"
 msgid "Print eBook"
 msgstr "Wydrukuj książkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Zmień wielkość liter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Zamień wielkość liter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Przeciągnij, aby zmienić wielkość"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Wyświetl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Ukryj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Przełącz"
 
@@ -15843,11 +15904,11 @@ msgstr ""
 "\n"
 "Dla pomocy odnośnie każdej komendy wpisz: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Nie wskazano etykiety"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15863,16 +15924,16 @@ msgstr "%sŚrednia ocena to %3.1f"
 msgid "Main"
 msgstr "Główna"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 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:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopiowanie <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Kompaktowanie bazy danych"
 
@@ -17094,95 +17155,95 @@ msgstr "Nie pobieraj najnowszych wersji wbudowanych źródeł z serwera calibre"
 msgid "Unknown News Source"
 msgstr "Nieznane źródło informacji"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Pobranie zakończone"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " z "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tNieprawidłowe linki:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "Nie udało się pobrać artykułu."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr "Informacje dotyczące debugowania są dostępne wcześniej w tym lgou"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr "Uruchom z opcją -vv aby zobaczyć powód"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Pobieram strumienie..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Pobierz strumienie ze strony głównej"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Próbuję pobrać okładkę..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Generuje nagłówek..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Rozpoczynam pobieranie [%d wątek(ków)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Strumienie pobrano do %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Nie można pobrać okładki: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Pobieranie okładki z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Obrazek nagłówka pobrany"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Artykuł bez tytułu"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artykuł pobrany: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Pobieranie artykułu nie powiodło się: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Pobieram strumień"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -17190,7 +17251,7 @@ msgstr ""
 "Nie udało się zalogować, sprawdź nazwę użytkownika i hasło do usługi "
 "czasopisma calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17362,9 +17423,6 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "Configuration"
 #~ msgstr "Ustawienia"
 
-#~ msgid "Toolbar"
-#~ msgstr "Pasek narzędzi"
-
 #~ msgid "Path to the cover to be used for this book"
 #~ msgstr "Ścieżka do okładki dla tej książki"
 
@@ -18081,6 +18139,9 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid " plugins"
 #~ msgstr " - wtyczki"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nie znaleziono wtyczki w "
+
 #~ msgid "The series index"
 #~ msgstr "Spis serii"
 
@@ -19021,6 +19082,9 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "&Highlight"
 #~ msgstr "Podświetlaj"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Dostosuj pasek narzędzi"
+
 #~ msgid "Unknown publisher"
 #~ msgstr "Nieznany wydawca"
 
@@ -19036,8 +19100,20 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "Downloads series/covers/rating information from librarything.com"
 #~ msgstr "Ś"
 
+#~ msgid "Customize searching"
+#~ msgstr "Dostosuj wyszukiwanie"
+
 #~ msgid "Downloads series information from ww2.kdl.org"
 #~ msgstr "Pobierz informacje o serii z ww2.kdl.org"
 
 #~ msgid "backslashreplace"
 #~ msgstr "zastąpienie znaku \"\\\""
+
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "Podziel pa&sek narzędzi na dwa paski"
+
+#~ msgid "Skip 'Connect to iTunes' recommendation"
+#~ msgstr "Pomiń rekomendację 'Podłącz do iTunes'"
+
+#~ msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
+#~ msgstr "Włącz pomijanie okna rekomendacji 'Podłącz do iTunes'"
diff --git a/src/calibre/translations/pt.po b/src/calibre/translations/pt.po
index ce35e9ad2f..03f2ea5073 100644
--- a/src/calibre/translations/pt.po
+++ b/src/calibre/translations/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-21 20:14+0000\n"
 "Last-Translator: Carlos Ricardo Santos <carlosricardosantos@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #~ msgid "Monday"
@@ -41,11 +41,11 @@ msgstr ""
 #~ msgid "Thursday"
 #~ msgstr "Quintas-Feiras"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Não faz absolutamente nada"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -56,7 +56,7 @@ msgstr "Não faz absolutamente nada"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -73,9 +73,9 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -95,7 +95,7 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -141,19 +141,19 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -161,12 +161,12 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -177,11 +177,11 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -195,46 +195,46 @@ msgstr "Não faz absolutamente nada"
 msgid "Unknown"
 msgstr "Desconhecido(a)"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Padrão"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personalizar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "É impossível configurar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tipo de ficheiro"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Leitor de metadados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Gravador de metadados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Gerador de catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Ação de interface do usuário"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferências"
@@ -361,8 +361,8 @@ msgstr ""
 "Adicione/remova as suas próprias colunas à lista de livros do Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Personalize a barra de ferramentas"
+msgid "Toolbar"
+msgstr "Barra de ferramentas"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -373,8 +373,8 @@ msgstr ""
 "acções que estão disponíveis em cada um"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Personalizar pesquisa"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -707,35 +707,31 @@ msgstr "Este perfil destina-se ao dispositivo B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Este perfil destina-se ao Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Extras instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Estrutura para os extras de tipo de ficheiro"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Personalização do extra local"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Extras desactivados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Módulos de extensão activados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Nenhum extra válido encontrado em "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "A inicialização do extra %s falhou, deixando o seguinte relatório:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -747,18 +743,18 @@ msgstr ""
 "    Personalize o calibre carregando extras externos.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Adicione um extra especificando um caminho para o ficheiro zip que o contém."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Remova um extra identificado pelo seu nome. Não tem qualquer efeito sobre os "
 "extras integrados."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -766,15 +762,15 @@ msgstr ""
 "Personalize o extra. Especifique o nome do extra e uma expressão "
 "identificadora, separados por uma vírgula."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Listar todos os extras instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Activar o extra mencionado"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Desactivar o extra mencionado"
 
@@ -798,43 +794,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Estabelecer ligação a telefones S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Usar Série como Categoria no iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Capas em 'cache' do iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Dispositivo Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Estabelecer ligação com o sistema iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Dispositivo Apple detectado. Aguarde enquanto o iTunes é iniciado..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -843,27 +851,27 @@ msgstr ""
 "livro da biblioteca iTunes para o ambiente de trabalho e, depois, para a "
 "janela Biblioteca do calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "A actualizar a lista de metadados do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "terminado"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -873,7 +881,7 @@ msgstr ""
 "Apague-os utilizando a aplicação iBooks.\n"
 "Carregue em 'Mostrar Detalhes' para obter a lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -881,31 +889,31 @@ msgstr ""
 "Algumas capas não puderam ser convertidas.\n"
 "Carregue em 'Mostrar Detalhes' para obter a lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Notícias"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Estabelecer ligação com o sistema iTunes."
 
@@ -957,20 +965,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "A ir buscar a lista dos livros no aparelho..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "A transferir o(s) livro(s) para o aparelho..."
 
@@ -978,8 +986,8 @@ msgstr "A transferir o(s) livro(s) para o aparelho..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "A adicionar os livros à listagem de metadados do aparelho..."
 
@@ -989,8 +997,8 @@ msgstr "A adicionar os livros à listagem de metadados do aparelho..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "A remover os livros do aparelho..."
 
@@ -998,17 +1006,17 @@ msgstr "A remover os livros do aparelho..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "A apagar os livros da listagem de metadados do aparelho..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "A enviar os metadados para o aparelho..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "O BambookSDK não está instalado."
 
@@ -1321,15 +1329,15 @@ msgstr "Comunica com o leitor Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunicar com todos os leitores de livros Sony"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Todos por titulo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Todos por Autor"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1337,7 +1345,7 @@ msgstr ""
 "Lista de campos de metadados separada por vírgulas para a criação de "
 "colecções no dispositivo. Possibilidades incluídas: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1347,13 +1355,13 @@ msgstr ""
 "estes valores à lista para os activar. Às colecções será dado o nome "
 "existente a seguir aos dois pontos (caractere \":\")."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 "Carregar miniaturas de capas individuais para os livros (leitores mais "
 "recentes)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1367,14 +1375,14 @@ msgstr ""
 "AVISO: Esta opção apenas deve ser usada nos novos dispositivos SONY: 50, "
 "650, 950 e mais recentes."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Actualizar capas individuais ao utilizar a gestão automática (leitores mais "
 "recentes)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1384,11 +1392,11 @@ msgstr ""
 "liga o dispositivo. Desactive esta opção caso tenha uma grande quantidade de "
 "livros no dispositivo que torne a performance inaceitável."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Manter a relação altura/largura quando são geradas as miniaturas"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1398,6 +1406,17 @@ msgstr ""
 "altura/largura que a capa. Desactive se deseja que a miniatura fique no "
 "tamanho máximo, ignorando a relação altura/largura."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1534,7 +1553,7 @@ msgstr "Personalização adicional"
 msgid "Communicate with an eBook reader."
 msgstr "Comunica com um leitor de livros."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "A ir buscar informação sobre o aparelho..."
 
@@ -2355,7 +2374,7 @@ msgstr "A converter o ficheiro de origem para HTML..."
 msgid "Running transforms on ebook..."
 msgstr "A executar as transformações no livro..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "A criar"
 
@@ -2508,7 +2527,7 @@ msgstr "Iniciar"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Não inserir um Índice no início do livro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2519,6 +2538,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2927,105 +2950,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "ERRO DO TEMPLATE"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Não"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Sim"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Editora"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produtor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Comentários"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Série"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Linguagem"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Data e Hora"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Editado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Direitos"
 
@@ -3468,7 +3491,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr "O pedido à Amazon está a demorar demasiado. Tente mais tarde."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Fonte de meta-dados"
 
@@ -3607,7 +3630,7 @@ msgid "HTML TOC generation options."
 msgstr "Opções de geração do Índice em HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3805,6 +3828,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Assunto"
 
@@ -4131,74 +4155,78 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Enviar o ficheiro para o cartão de memória em vez da memória principal por "
 "predefinição"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Confirmar antes de apagar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Geometria da janela principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Notificar quando uma nova versão estiver disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Usar números romanos para o número da série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Ordenar lista de etiquetas por nome, popularidade ou classificação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Número de capas a mostrar no modo de navegação pelas capas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Predefinições para a conversão para o formato LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opções para o Visualizador de livros em formato LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formatos a usar pelo Visualizador interno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Colunas a serem apresentadas na lista de livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Iniciar automaticamente o servidor de conteúdos no arranque da aplicação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Notícias mais antigas guardadas na base de dados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Mostrar o ícone na área de notificação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Carregar as notícias descarregadas para o aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Apagar os livros da biblioteca após carregamento para o aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4206,17 +4234,17 @@ msgstr ""
 "Mostrar o fluxo de capas numa janela separada em vez de na janela principal "
 "do calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Desactivar as notificações a partir do ícone da área de notificação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Acção predefinida a executar quando se clica no botão \"Enviar para o "
 "aparelho\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4224,53 +4252,53 @@ msgstr ""
 "Começar a pesquisar à medida que escreve. Se isto estiver desactivado então "
 "a pesquisa apenas ocorrerá quando a tecla Enter ou Return for pressionada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Número máximo de processos de trabalho em espera."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Transferir meta-dados sociais (etiquetas/classificações/etc)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Substituir o autor e o título nos novos metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Se possível, descarregar automaticamente a capa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Limitar o número máximo de tarefa simultâneas ao número de CPUs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Esquema da interface de utilizador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 "Exibir classificação média por cada indicação de item no navegador de "
 "etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Desactivar animações da interface"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "Marque as categorias do navegador que não serão mostradas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Escolher ficheiros"
 
@@ -4489,8 +4517,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nenhuns livros seleccionados"
@@ -4693,7 +4721,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4763,7 +4791,7 @@ msgid "Bulk convert"
 msgstr "Converter a granel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "É impossível converter"
 
@@ -4771,7 +4799,7 @@ msgstr "É impossível converter"
 msgid "Starting conversion of %d book(s)"
 msgstr "Iniciar a conversão de %d livro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "Ficheiro de output vazio, provavelmente o processo de conversão falhou"
@@ -4962,7 +4990,7 @@ msgid "Stop Content Server"
 msgstr "Parar Servidor de Conteúdo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Email para"
 
@@ -4970,32 +4998,32 @@ msgstr "Email para"
 msgid "Email to and delete from library"
 msgstr "Enviar por email para e apagar da biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(apagar da biblioteca)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Configurar email para partilhar livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Enviar para o aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Ligar/Partilhar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "A parar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -5085,20 +5113,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "A fazer download de {0} para {1} livro(s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "É impossível editar os metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Não é possível combinar livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "A combinação exige a selecção de pelo menos dois livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5106,7 +5134,7 @@ msgstr ""
 "Está prestes a convergir mais de 5 livros. Tem a <b>certeza</b> que quer "
 "continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5114,7 +5142,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5126,7 +5154,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5137,19 +5165,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Recolher notícias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Recolher notícias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " recolhida."
 
@@ -5214,7 +5242,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Executar o assistente de boas vindas"
 
@@ -5459,7 +5487,7 @@ msgid "The specified directory could not be processed."
 msgstr "É impossível processar a pasta especificada."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nenhuns livros"
 
@@ -5677,8 +5705,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Caminho"
 
@@ -5688,17 +5716,17 @@ msgstr "Caminho"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Colecções"
 
@@ -5708,25 +5736,25 @@ msgid "Click to open"
 msgstr "Clicar para abrir"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Nenhum"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Colar Capa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Copiar Capa"
 
@@ -5784,7 +5812,7 @@ msgstr "Ficheiro de destino"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5807,14 +5835,14 @@ msgstr "Ficheiro de destino"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6396,10 +6424,14 @@ msgstr "Não inserir um &Índice no início do livro."
 msgid "FB2 Output"
 msgstr "Ficheiro de destino FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Assistente de alteração proporcional dos tipos de letra"
@@ -7003,7 +7035,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Teste"
 
@@ -7596,21 +7628,21 @@ msgstr "Erro"
 msgid "Error communicating with device"
 msgstr "Erro ao comunicar com o aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Nenhuns formatos suportados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Seleccionar pasta para abrir como dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Erro ao comunicar com o aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7618,69 +7650,69 @@ msgstr ""
 "Houve um erro temporário ao comunicar com o aparelho. Por favor desligue e "
 "volte a ligar o aparelho ou reinicie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Aparelho: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "seleccionado para enviar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i de %i Livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 de %i Livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Escolher o formato a enviar para o aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Nenhum aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "É impossível enviar: O aparelho não está ligado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Nenhum cartão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "É impossível enviar: O aparelho não tem cartão de memória"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Converter automaticamente os seguintes livros antes de os carregar para o "
 "aparelho?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "A enviar catálogos para o dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Enviar notícias para o aparelho."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "A enviar livros para o aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7689,11 +7721,11 @@ msgstr ""
 "encontrados formatos adequados. Converta o(s) livro(s) para um formato "
 "suportado pelo seu aparelho primeiro."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Sem espaço no aparelho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7987,7 +8019,7 @@ msgstr "Escolher o formato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formato"
 
@@ -8128,7 +8160,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Cancelar"
 
@@ -8175,8 +8207,8 @@ msgid "Location"
 msgstr "Localização"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8208,12 +8240,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Nome de autor inválido"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -8403,22 +8435,22 @@ msgid "Working"
 msgstr "A trabalhar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Minúsculas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Maiúsculas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Capitalização de Título"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9933,12 +9965,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -10009,7 +10041,7 @@ msgid "Send test mail from %s to:"
 msgstr "Enviar um email de teste de %s para:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Teste"
 
@@ -10254,64 +10286,64 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Notícias:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "Livro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Anexado, vai encontrar o livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "no formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "A enviar o email para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Converter automaticamente os seguintes livros antes de enviar via email?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "É impossível enviar os livros seguintes por email poque não foram "
 "encontrados formatos adequados:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Enviar as notícias para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10325,67 +10357,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "&Expressão regular"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Nome do ficheiro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Título:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Expressão regular (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Sem correspondência(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autor(es):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Expressão regular (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Série:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Expressão regular (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Índice da série:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Expressão regular (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Expressão regular (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Navegador de Capas de livros"
@@ -10598,48 +10648,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Tamanho (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "O nome da 'procura' é  \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Livro <font face=\"serif\">%s</font> de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Duplo clique para <b>me</b> editar<br><br>"
 
@@ -10718,7 +10768,7 @@ msgstr ""
 "<i>%s</i> ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Não foram encontradas correspondências"
 
@@ -10735,12 +10785,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Barra de ferramentas do Visualizador de ficheiros LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Página Seguinte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Página Anterior"
 
@@ -11558,20 +11608,27 @@ msgstr "Tor&nar predefinido"
 msgid "&Remove email"
 msgstr "&Remover email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Enviar automaticamente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 "Formatos a enviar por email. O primeiro formato correspondente será enviado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11580,7 +11637,7 @@ msgstr ""
 "email <br>para este endereço de email (desde que esteja num dos formatos "
 "listados)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "novo endereço de email"
 
@@ -11592,93 +11649,93 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Médio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Pequeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "Número de &capas a mostrar no modo de navegação (precisa de reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Lin&guagem (precisa de reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Activar o &ícone na área de notificação (precisa de reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "&Mostrar o navegador de capas numa janela separada (precisa de reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11687,22 +11744,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11712,64 +11769,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -12540,30 +12593,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12660,7 +12717,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Procurar"
@@ -12755,166 +12812,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Gerir as Procuras guardadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Gerir as Categorias do Utilizador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Procuras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Duplicar nome da procura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "O nome da Procura guardada %s já está em uso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12924,60 +12981,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Ordenar por nome"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Ordenar por popularidade"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Ordenar por Classificação média"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Corresponder todos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Corresponder algum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Gerir as categorias do &utilizador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -13054,23 +13111,23 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Erro de conversão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Falha</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Existem processos activos. Tem a certeza que quer sair?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13080,11 +13137,11 @@ msgstr ""
 "                      Sair pode causar corrupção no aparelho.<br>\n"
 "                      Tem a certeza que quer sair?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13289,7 +13346,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opções para personalizar o Visualizador de livros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Lembrar o tamanho da última janela utilizada"
 
@@ -13369,36 +13426,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Ir para..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -13476,75 +13533,75 @@ msgstr "Pré-visualização da Impressão"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "A ligar ao dict.org para procurar <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Escolher o livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Nenhuma correspondência encontrada para: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "A carregar o fluxo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "A representar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Adicionar marcador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Introduzir o título para o marcador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Gerir Marcadores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "A carregar o livro..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "É impossível abrir o livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opções para controlar o Visualizador de livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Se especificado a janela do Visualizador vai tentar vir para a frente quando "
 "iniciada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Imprimir alertas javascript e mensagens da consola na consola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13622,27 +13679,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Imprimir o livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Alterar a Capitalização"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Alterar a Capitalização"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14919,11 +14976,11 @@ msgstr ""
 "  %s\n"
 "Para ajuda num comando individual: %%prog comando --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14937,17 +14994,17 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>A migrar a base de dados antiga para a biblioteca de livros em "
 "%s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "A copiar <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "A compactar a base de dados"
 
@@ -16022,95 +16079,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Fonte de Notícias desconhecida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "A receita \"%s\" necessita de um utilizador e palavra-passe."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Descarregamento terminado"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Falha no descarregamento dos seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "Falha no descarregamento de partes dos seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tAtalhos falhados:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "A recolher as fontes..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Tirar as fontes da página de índice"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "A tentar descarregar a capa..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "A criar o mastro..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "A iniciar o descarregamento [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Fontes descarregadas para %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "É impossível descarregar a capa: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "A descarregar a capa de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Imagem do mastro transferida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Artigo Sem Título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artigo descarregado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Falha no descarregamento do artigo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "A recolher a fonte"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16118,7 +16175,7 @@ msgstr ""
 "O início de sessão falhou, verifique o seu nome de utilizador e palavra-"
 "chave do serviço de Periódicos do calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17010,6 +17067,9 @@ msgstr "Não descarregar folhas de estilos CSS."
 #~ msgid "Regular expression (?P<authors>)"
 #~ msgstr "Expressão regular (?P<authors>)"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nenhum extra válido encontrado em "
+
 #~ msgid "Add new plugin"
 #~ msgstr "Adicionar novo extra"
 
@@ -17084,9 +17144,6 @@ msgstr "Não descarregar folhas de estilos CSS."
 #~ msgid "Delete downloaded news older than "
 #~ msgstr "Apagar as notícias mais antigas que "
 
-#~ msgid "Toolbar"
-#~ msgstr "Barra de ferramentas"
-
 #~ msgid "Show button labels in the toolbar"
 #~ msgstr "Mostrar as descrições nos botões da barra de ferramentas"
 
@@ -19222,6 +19279,9 @@ msgstr "Não descarregar folhas de estilos CSS."
 #~ msgid "Sending to &device"
 #~ msgstr "A enviar para &device"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Personalize a barra de ferramentas"
+
 #~ msgid "Communicate with the PocketBook 602 reader."
 #~ msgstr "Comunicar com o leitor PocketBook 602."
 
@@ -19403,3 +19463,6 @@ msgstr "Não descarregar folhas de estilos CSS."
 
 #~ msgid "Check database integrity"
 #~ msgstr "Verificar a integridade da base de dados"
+
+#~ msgid "Customize searching"
+#~ msgstr "Personalizar pesquisa"
diff --git a/src/calibre/translations/pt_BR.po b/src/calibre/translations/pt_BR.po
index a0d580df1a..488cf69abb 100644
--- a/src/calibre/translations/pt_BR.po
+++ b/src/calibre/translations/pt_BR.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-04-01 03:17+0000\n"
 "Last-Translator: Júlio Cezar Santos Pires <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: 2011-04-01 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:53+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Não faz absolutamente nada"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Não faz absolutamente nada"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Não faz absolutamente nada"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Base"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personalizar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Não foi possível configurar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tipo de arquivo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Leitor de metadados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Escritor de metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Gerador de catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Ação da Interface do Usuário"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferências"
@@ -334,8 +334,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Adiciona/remove suas próprias colunas na lista de livro do calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Personalizar a barra de ferramentas"
+msgid "Toolbar"
+msgstr "Barra de ferramentas"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -346,8 +346,8 @@ msgstr ""
 "ações estão disponíveis em cada"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Personalizar busca"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -683,35 +683,31 @@ msgstr "Este perfil é destinado para a B & N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Este perfil é destinado para o Sanda Bambook"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Plug-ins instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapeamento para plugins de tipo de aquivo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Customização de plug-ins locais"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Plug-ins desativados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Plug-ins habilitados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-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:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -723,18 +719,18 @@ msgstr ""
 "     customiza o calibre usando plugins externos\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -742,15 +738,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:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Listar todos os plugins instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Habilitar a extensão com nome"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Desabilitar a extensão com nome"
 
@@ -774,43 +770,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunica-se com os telefones S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Usar Séries como categorias no iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Cache das capas vindas do iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Dispositivo da Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Comunicar com iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Dispositivo Apple detectado, iniciando iTunes, aguarde por favor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -819,27 +827,27 @@ msgstr ""
 "iTunes Library para o desktop, em seguida, adicione para a   biblioteca "
 "calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Atualizando a listagem de metadados do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d de %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "concluído"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -849,7 +857,7 @@ msgstr ""
 "Remova usando a aplicação iBooks.\n"
 "Clique 'Mostrar Detalhes' para a lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -857,31 +865,31 @@ msgstr ""
 "Algumas capas não puderam ser convertidas.\n"
 "Clique em 'Mostrar Detalhes' para a listagem."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Notícias"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Comunicar com iTunes."
 
@@ -933,20 +941,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Obtendo lista de livros no dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Transferindo livros para o dispositivo..."
 
@@ -954,8 +962,8 @@ msgstr "Transferindo livros para o dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Adicionando livros à lista de metadados do aparelho..."
 
@@ -965,8 +973,8 @@ msgstr "Adicionando livros à lista de metadados do aparelho..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Removendo livros do dispositivo..."
 
@@ -974,17 +982,17 @@ msgstr "Removendo livros do dispositivo..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Removendo livros da lista de metadados do aparelho..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Enviando metadados ao dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK não foi instalado."
 
@@ -1289,15 +1297,15 @@ msgstr "Comunica-se com o leitor Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunica-se com todos os leitores da Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Todos por título"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Todos por autor"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1305,7 +1313,7 @@ msgstr ""
 "Lista de campos de metadados separados por vírgulas para transformar em "
 "coleções no dispositivo. Possibilidades incluem: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1315,11 +1323,11 @@ msgstr ""
 "valores à lista para habilita-los. As coleções receberão o nome após os dois "
 "pontos (\":\")."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1328,29 +1336,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1488,7 +1507,7 @@ msgstr "Personalização Extra"
 msgid "Communicate with an eBook reader."
 msgstr "Comunica-se com um leitor de eBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Obtendo informações do dispositivo..."
 
@@ -2278,7 +2297,7 @@ msgstr "Convertendo entrada para HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Executando transformações no ebook..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Criando"
 
@@ -2429,7 +2448,7 @@ msgstr "Iniciar"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Não insira um Sumário no início do livro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2440,6 +2459,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2826,105 +2849,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Não"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Sim"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Editora"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Produtor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Comentários"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Tags"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Série"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Idioma"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Assinatura de tempo (timestamp)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Publicado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Direitos"
 
@@ -3332,7 +3355,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3468,7 +3491,7 @@ msgid "HTML TOC generation options."
 msgstr "Opções de geração de Sumário HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3657,6 +3680,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Assunto"
 
@@ -3954,74 +3978,78 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Por padrão, enviar o arquivo ao cartão de memória ao invés de à memória "
 "principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Confirmar antes de apagar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Geometria da janela principal."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Notificar quando uma nova versão estiver disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Usar numerais romanos para números da série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Ordenar lista de campos por nome, popularidade, ou pontuação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Quantia de capas a serem exibidas no modo de navegação por capas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Padrões para conversão para LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opções do visualizador de eBooks LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formatos a serem exibidos através do visualizador interno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Campos que serão mostradas na lista de livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Automaticamente iniciar o servidor de conteúdo quando a aplicação iniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Notícia mais antiga é deixada na base de dados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Mostrar icone na bandeja do sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Enviar noticias baixadas para o dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Eliminar livros da biblioteca após enviá-los ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4029,66 +4057,66 @@ msgstr ""
 "Mostra o cover flow em uma janela independente e não na janela principal do "
 "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Desativar notificações ba bandeja do sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 "Ação padrão à realizar quando o botão \"enviar para o dispositivo\" é clicado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Número máximo de processos de trabalho em espera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Obter metadados sociais (rótulos/avaliações/etc.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Sobrescrever autor e título com os novos metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Limitar o máximo de tarefas simultâneas ao número de CPUs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "O layout da interface do usuário"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Mostrar o indicador de avaliação média por item no navegador de tags"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Desabilitar animações da interface gráfica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "categorias que não devem ser exibidas no navegador de tags"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Escolher arquivos"
 
@@ -4306,8 +4334,8 @@ msgstr "Usar apenas notas geradas a partir da biblioteca principal"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nenhum livro selecionado"
@@ -4508,7 +4536,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4577,7 +4605,7 @@ msgid "Bulk convert"
 msgstr "Conversão em massa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Não foi possível converter"
 
@@ -4585,7 +4613,7 @@ msgstr "Não foi possível converter"
 msgid "Starting conversion of %d book(s)"
 msgstr "Iniciando conversão de %d livro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4770,7 +4798,7 @@ msgid "Stop Content Server"
 msgstr "Parar Servidor de Conteúdo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Enviar por e-mail para"
 
@@ -4778,32 +4806,32 @@ msgstr "Enviar por e-mail para"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Configurar compartilhamento de livros baseado em email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Enviar para o dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Conectar/compartilhar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4890,20 +4918,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Não foi possível editar metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Não pode fundir livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -4911,7 +4939,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4919,7 +4947,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4931,7 +4959,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4942,19 +4970,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Obter notícias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Lendo novas notícias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -5019,7 +5047,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Rodar o assistente de boas vindas"
 
@@ -5268,7 +5296,7 @@ msgid "The specified directory could not be processed."
 msgstr "O diretório específico não pode ser processado."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nenhum livro"
 
@@ -5487,8 +5515,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Caminho"
 
@@ -5498,17 +5526,17 @@ msgstr "Caminho"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Coleções"
 
@@ -5518,25 +5546,25 @@ msgid "Click to open"
 msgstr "Clique para abrir"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Nenhum"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5594,7 +5622,7 @@ msgstr "saída"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5617,14 +5645,14 @@ msgstr "saída"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6200,10 +6228,14 @@ msgstr "Não insira um &Sumário no início do livro."
 msgid "FB2 Output"
 msgstr "Saída FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Assistente para redimensionar a font"
@@ -6822,7 +6854,7 @@ msgid "Regex:"
 msgstr "Expressão regular:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Teste"
 
@@ -7414,21 +7446,21 @@ msgstr "Erro"
 msgid "Error communicating with device"
 msgstr "Erro ao se comunicar com o dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Nenhum formato apropriado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Selecionar pasta para abrir como dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Erro ao comunicar com o dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7436,68 +7468,68 @@ msgstr ""
 "Houve um erro temporário de comunicação com o dispositivo. Por favor, "
 "desconecte o cabo e reconecte o dispositivo e ou reinicie o mesmo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "selecionado para envio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Escolha o formato para enviar ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Nenhum dispositivo disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 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:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Nenhum cartão disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Auto converter os livros a seguir antes de enviar para dispositivo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Enviando catálogos ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Enviando notícias ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Enviando livros ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7506,11 +7538,11 @@ msgstr ""
 "formato adequado foi encontrado. Primeiro, converta o(s) livros(s) para um "
 "formato suportado pelo seu dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Não há espaço no dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7800,7 +7832,7 @@ msgstr "Escolha o formato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formato"
 
@@ -7936,7 +7968,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Cancelar"
 
@@ -7985,8 +8017,8 @@ msgid "Location"
 msgstr "Localização"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8018,12 +8050,12 @@ msgid "Author sort"
 msgstr "Autor ordenado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Nome de autor inválido"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -8216,22 +8248,22 @@ msgid "Working"
 msgstr "Processando"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "todas minúsculas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "TODAS MAIÚSCULAS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Todas As Palavras, Primeira Letra Maiúscula (Título)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9751,12 +9783,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "O item é branco"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "Um item não pode ser nada. Invés disso apague-o."
 
@@ -9827,7 +9859,7 @@ msgid "Send test mail from %s to:"
 msgstr "Enviar email de testes de %s para:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Testar"
 
@@ -10063,63 +10095,63 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Notícias:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "eBook:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Você vai achar o eBook anexado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "no formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Enviando e-mail para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "Auto converter os livros a seguir antes de enviar por e-mail?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Não foi possível enviar por e-mail os livros a seguir, porque nenhum formato "
 "aplicável foi encontrado:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Enviar notícias para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10133,67 +10165,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "&Expressão regular"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Nome do arquivo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Título:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Não coincide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autores:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Expressão regular (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Série:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Expressão regular (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Índice da série:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Expressão regular (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Navegador de Capas"
@@ -10405,48 +10455,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "No dispositico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Tamanho (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "O nome para a pesquisa é \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "Na Biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Tamanho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Livro <font face=\"serif\">%s</font> de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Marcado para exclusão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Um duplo clique para <b>editar</b>-me<br><br>"
 
@@ -10524,7 +10574,7 @@ msgstr ""
 "<b>Nenhuma ocorrência</b> para a frase de pesquisa <i>%s</i> foi encontrada."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
@@ -10541,12 +10591,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Próxima Página"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Página Anterior"
 
@@ -11392,19 +11442,26 @@ msgstr "Tornar &padrão"
 msgid "&Remove email"
 msgstr "&Remover e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Auto envio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "E-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11413,7 +11470,7 @@ msgstr ""
 "<br>para este endereço de email (desde que ele esteja em um dos formatos "
 "listados)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "novo endereço de email"
 
@@ -11425,94 +11482,94 @@ msgstr ""
 msgid "Wide"
 msgstr "Amplo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Médio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Pequeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Sempre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automático"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nunca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "&Layout da Interface do Usuário (precisa reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Selecionar &idioma (requer reinicialização):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Mostrar média das avaliações no navegador de tags"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Desabilitar todas animações. Útil se você possuí um computador velho/lento."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Desabilitar &animações"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 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/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Mostrar &splash screen (tela inicial) na inicialização"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Desabilitar &notificações na bandeja do sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Mostrar o &navegador de capas em uma janela separada (precisa reiniciar)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11521,22 +11578,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11546,52 +11603,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "Barra de ferramen&tas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Tamanho do &Icone:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Mostrar &texto abaixo dos icones:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Separar a barra de ferramentas em duas barras"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Aplicar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Restaurar pa&drões"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Restaurar para padrões não é suportado para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11599,7 +11652,7 @@ msgstr ""
 "Algumas das mudanças que você fez precisam de um reinicio. Por favor, "
 "reinicie o calibre assim que possível."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11608,7 +11661,7 @@ msgstr ""
 "imediatamente. Você não terá permissão de alterar mais nenhuma preferência, "
 "até que você reinicie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Reinício é necessário"
@@ -12376,30 +12429,34 @@ msgid "The main toolbar"
 msgstr "A barra de ferramenta principal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "A barra de ferramenta principal quando o dispositivo é desconectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "O menu de contexto para os livros dentro da biblioteca do calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "O menu de contexto para os livros no dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Não foi possível adicionar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Não foi possível adicionar as ações %s para este local"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Não foi possível remover"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Não foi possível remover as ações %s deste local"
 
@@ -12496,7 +12553,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Pesquisar"
@@ -12591,166 +12648,166 @@ msgstr "Clique para alterar"
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Esconder categoria %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Mostrar categoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Gerenciar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Gerenciar Pesquisas Salvas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Gerenciar categorias do usuário"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Mostrar todas as categorias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Pesquisas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Nome de pesquisa duplicado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "O nome da pesquisa salva %s já está sendo usado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12760,62 +12817,62 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Ordenar pelo nome"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Ordenar pela popularidade"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Ordernar pela média de avaliações"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Configura forma de ordenação para entradas no Navegador de Tags"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Todos os critérios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Qualquer critério"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
 "Quando selecionando multiplos itens no Navegador de Tags, correspondam a "
 "qualquer critério ou todos eles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Gerenciar categorias do &usuário"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Adicionar suas próprias categorias no Navegador de Tags"
 
@@ -12892,23 +12949,23 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Erro ao converter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Lista Desativada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Falha</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -12918,11 +12975,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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13128,7 +13185,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opções de personalização do visualizador de eBooks"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Lembrar do último tamanho da janela"
 
@@ -13210,36 +13267,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Procurar no dicionário"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Ir para..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Próxima Seção"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Seção Anterior"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Início do Documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Fim do documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Início da Seção"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Fim da seção"
 
@@ -13317,75 +13374,75 @@ msgstr "Visualizar impressão"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Conectando em dict.org para procurar: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Escolher eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Nenhuma correspondência encontrada para: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Favorito #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Adicionar favorito"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Colocar o título para o favorito:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Organizar favoritos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Carregando eBook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Não foi possível abrir o eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opções de controle do visualizador de eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Se especificado, a janela do visualizador irá tentar vir para frente quando "
 "iniciada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Imprimir alerta javascript e mensagens de console no console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13463,27 +13520,27 @@ msgstr "Localizar ocorrência anterior"
 msgid "Print eBook"
 msgstr "Imprimir eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Alterar maiúsculas e minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "iNVERTER maiúsculas e MINÚSCULAS"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Arraste para redimensionar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Esconder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Alternar"
 
@@ -14796,11 +14853,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14814,17 +14871,17 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Migrando o banco de dados antigo para a biblioteca de ebook em "
 "%s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Compactando banco de dados"
 
@@ -15902,95 +15959,95 @@ msgstr "Não baixar a ultima versão das listas do servidor do calibre"
 msgid "Unknown News Source"
 msgstr "Fonte de notícias desconhecida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Download concluído"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Falha ao baixar os seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tLinks que falharam:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Obtendo feeds..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Obtendo feeds da página índice"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Tentando obter capa..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Iniciando o download [%d tarefa(s)]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Feeds descarregados para %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 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:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Baixando capa de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Imagem de cabeçalho baixada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Artigo sem título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artigo transferido: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Transferência de artigo falhou: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Obtendo feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -15998,7 +16055,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16333,9 +16390,6 @@ msgstr "Não baixar folhas de estilo CSS."
 #~ msgid "Compacting..."
 #~ msgstr "Compactando..."
 
-#~ msgid "Toolbar"
-#~ msgstr "Barra de ferramentas"
-
 #~ msgid "&Add"
 #~ msgstr "&Adicionar"
 
@@ -16722,6 +16776,9 @@ msgstr "Não baixar folhas de estilo CSS."
 #~ "consecutivas de texto. Por padrão nenhuma manipulação da altura da linha é "
 #~ "realizada."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Não foi encontrado um plugin válido em "
+
 #~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
 #~ msgstr "Se comunica com o leitor de eBooks Sony PRS-600/700/900"
 
@@ -17401,6 +17458,9 @@ msgstr "Não baixar folhas de estilo CSS."
 #~ msgid "&User stylesheet"
 #~ msgstr "Folha de estilo do &Usuário"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Personalizar a barra de ferramentas"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Communicar com o Kogan"
 
@@ -17598,6 +17658,9 @@ msgstr "Não baixar folhas de estilo CSS."
 #~ msgid "Tags to apply when adding a book:"
 #~ msgstr "Tags serão aplicadas quando adicionar livros"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Separar a barra de ferramentas em duas barras"
+
 #~ msgid "Some inconsistencies found"
 #~ msgstr "Algumas inconsistências encontradas"
 
@@ -17668,3 +17731,6 @@ msgstr "Não baixar folhas de estilo CSS."
 
 #~ msgid "Communicate with the Digma Q600"
 #~ msgstr "Comunicar-se com o Digma Q600"
+
+#~ msgid "Customize searching"
+#~ msgstr "Personalizar busca"
diff --git a/src/calibre/translations/ro.po b/src/calibre/translations/ro.po
index 8c335586bc..53837f9001 100644
--- a/src/calibre/translations/ro.po
+++ b/src/calibre/translations/ro.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-10 11:29+0000\n"
 "Last-Translator: Andrei B <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: 2011-03-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:49+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Nu face absolut nimic"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Nu face absolut nimic"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Nu face absolut nimic"
 msgid "Unknown"
 msgstr "Necunoscut(ă)"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Bază"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personalizează"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Nu se poate configura"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Tip de fișier"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Cititor de meta-date"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Scriitor de meta-date"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generator de catalog"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Acțiune a interfeței utilizatorului"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Preferințe"
@@ -336,8 +336,8 @@ msgstr ""
 "Adaugă/șterge propriile tale coloane în lista de cărți a programului Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Personalizați bara cu unelte"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -348,8 +348,8 @@ msgstr ""
 "disponibile ale fiecăruia"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Perzonalizează căutarea"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -690,35 +690,31 @@ msgstr "Acest profil este pentru B&N Nook Color"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Acest profil este pentru Sanda Bambook"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Module instalate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapari pentru module de fisiere"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Personalizarea locala a plugin-urilor"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Module dezactivate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Module activate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-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:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -730,18 +726,18 @@ msgstr ""
 "    Personalizeaza Calibre prin folosirea plugin-urilor externe.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -749,15 +745,15 @@ msgstr ""
 "Personalizeaza un plugin. Specifica numele plugin-ului si sirul personalizat "
 "separate prin virgula."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Listează toate plugin-urile instalate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Activează plugin-ul specificat prin nume"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Dezactivează plugin-ul specificat prin nume"
 
@@ -781,43 +777,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Comunica cu telefoanele S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Foloseste Seria ca si Categorie in iTunes/iBoooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Memorare în cache a copertelor de la iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Dispozitiv Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Conversează cu iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Dispozitiv Apple detectat, lansez iTunes, va rog asteptati ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -825,27 +833,27 @@ msgstr ""
 "Nu se pot copia cărți direct din iDevice. Trage din iTunes Library în "
 "Desktop, apoi adaugă la fereastra Library a lui Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Actualizez lista de metadate a dispozitivului ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d din %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "terminat"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -855,7 +863,7 @@ msgstr ""
 "Sterge folosing aplicatia iBooks.\n"
 "Apasa 'Afiseaza detalii'  pentru o lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -863,31 +871,31 @@ msgstr ""
 "Anumite coperti nu au putut fi convertite.\n"
 "Apasa 'Afiseaza detalii' pentru o lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Noutăți"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Catalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Comunica cu iTunes."
 
@@ -935,20 +943,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Obtine lista cartilor din dispozitiv"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Transfera carti catre dispozitiv..."
 
@@ -956,8 +964,8 @@ msgstr "Transfera carti catre dispozitiv..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Adaug carti la lista metadata a dispozitivului..."
 
@@ -967,8 +975,8 @@ msgstr "Adaug carti la lista metadata a dispozitivului..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Sterge carti din dispozitiv..."
 
@@ -976,17 +984,17 @@ msgstr "Sterge carti din dispozitiv..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Sterg carti din lista metadata a dispozitivului..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Trimite metadate catre dispozitiv"
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK nu a fost instalat."
 
@@ -1291,15 +1299,15 @@ msgstr "Comunica cu Sony PRS-500"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Comunica cu toate cititoarele eBook Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1307,18 +1315,18 @@ msgstr ""
 "Lista separata prin virgule a campurilor de metadate ce vor fi transformate "
 "in colectii in dispozitiv. "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1327,29 +1335,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1486,7 +1505,7 @@ msgstr "Personalizare suplimentara"
 msgid "Communicate with an eBook reader."
 msgstr "Comunica cu un cititor eBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Obtin informatii despre dispozitiv..."
 
@@ -2273,7 +2292,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2395,7 +2414,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2406,6 +2425,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2757,105 +2780,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3238,7 +3261,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3371,7 +3394,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3537,6 +3560,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3801,135 +3825,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -4137,8 +4165,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4335,7 +4363,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4401,7 +4429,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4409,7 +4437,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4590,7 +4618,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4598,32 +4626,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4710,26 +4738,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4737,7 +4765,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4749,7 +4777,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4760,19 +4788,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4837,7 +4865,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -5079,7 +5107,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5281,8 +5309,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5292,17 +5320,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5312,25 +5340,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5388,7 +5416,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5411,14 +5439,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5983,10 +6011,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6578,7 +6610,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -7163,97 +7195,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7539,7 +7571,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7675,7 +7707,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7722,8 +7754,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7755,12 +7787,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7944,22 +7976,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9439,12 +9471,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9513,7 +9545,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9748,61 +9780,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9816,67 +9848,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10084,48 +10134,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10200,7 +10250,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10217,12 +10267,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -11028,25 +11078,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -11058,91 +11115,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11151,22 +11208,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11176,64 +11233,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11964,30 +12017,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12084,7 +12141,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -12177,166 +12234,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12346,60 +12403,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12472,34 +12529,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12699,7 +12756,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12777,36 +12834,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12882,73 +12939,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13023,27 +13080,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14209,11 +14266,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14227,15 +14284,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15272,95 +15329,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Articol fără titlu"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -15368,7 +15425,7 @@ msgstr ""
 "Conectare nereuşităi, verificaţi numele de utilizator şi parola pentru "
 "serviciul Calibre Periodica."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15623,6 +15680,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Foloseste o expresie regulata pentru a incerca sa scoti subsolul paginii"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nu a fost găsit niciun modul valid în "
+
 #~ msgid "Communicate with iBooks through iTunes."
 #~ msgstr "Comunica cu iBooks prin intermediul iTunes."
 
@@ -15644,6 +15704,9 @@ msgstr ""
 #~ msgid "  "
 #~ msgstr "  "
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Personalizați bara cu unelte"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Conversează cu Kogan"
 
@@ -15667,3 +15730,6 @@ msgstr ""
 
 #~ msgid "Communicate with the Digma Q600"
 #~ msgstr "Comunica cu Digma Q600"
+
+#~ msgid "Customize searching"
+#~ msgstr "Perzonalizează căutarea"
diff --git a/src/calibre/translations/ru.po b/src/calibre/translations/ru.po
index 5e08e52039..ac9fc3b962 100644
--- a/src/calibre/translations/ru.po
+++ b/src/calibre/translations/ru.po
@@ -6,26 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-23 17:04+0000\n"
-"Last-Translator: Andrey Olykainen <Unknown>\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-07 17:12+0000\n"
+"Last-Translator: Konstantin <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: 2011-03-27 04:46+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-08 04:44+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "Generated-By: pygettext.py 1.5\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,329,-1,-1\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Ничего не делает"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -36,7 +36,7 @@ msgstr "Ничего не делает"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -53,9 +53,9 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -75,7 +75,7 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -121,19 +121,19 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -141,12 +141,12 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -157,11 +157,11 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -175,46 +175,46 @@ msgstr "Ничего не делает"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Основной"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Настроить"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Невозможно настроить"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Тип файла"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Чтение метаданных"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Запись метаданных"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Генератор каталога"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Действие Пользовательского Интерфейса"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Параметры"
@@ -337,8 +337,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Добавьте/удалите ваши собственные столбцы в список книг Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Настройка панели инструментов"
+msgid "Toolbar"
+msgstr "Панель инструментов"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -349,8 +349,8 @@ msgstr ""
 "будут доступны для того и другого."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Настроить поиск"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -659,6 +659,7 @@ msgstr "Подходит для использования с любым уст
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:509
 msgid "Suitable for use with any large screen e-ink device"
 msgstr ""
+"Подходить для использования на любых e-ink устройствах с большим экраном"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:518
 msgid "This profile is intended for the 5-inch JetBook."
@@ -684,35 +685,31 @@ msgstr "Этот профайл предназначен для B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Этот профиль предназначен для Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Установленные плагины"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Назначение плагинов типов файлов"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Настройка плагина"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Отключённые плагины"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Включенные плагины"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Не найден подходящий модуль в "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Неудачная инициализация модуля %s:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -724,30 +721,30 @@ msgstr ""
 "    Настроить calibre при помощи внешних плагинов.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Удалить плагин по имени. Не действует на встроенные плагины"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 "Настроить плагин. Укажите имя плагина и строку настроек, разделённые запятой."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Вывести список всех установленных плагинов"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Включить указазанный плагин"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Отключить указанный плагин"
 
@@ -771,71 +768,83 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Соединиться с телефоном S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr "Запретить драйвер Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr "Разрешить драйвер Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Использовать Серии как Категории в iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Кэш обложек iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Устройство Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Соединиться с iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Обнаружено устройство Apple, запуск iTunes, пожалуйста, подождите..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
-"Невозможно скопировать книги напрямую с IDevice. Перетащите из Библиотеки "
-"iTunes на рабочий стол, и потом добавте в окно Билиотеки calibre."
+"Невозможно скопировать книги напрямую с iDevice. Перетащите из Библиотеки "
+"iTunes на рабочий стол, и потом добавьте в окно Билиотеки calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Обновление списка метаданных устройства..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d из %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "Готово"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -845,7 +854,7 @@ msgstr ""
 "Удаление с помощью приложения iBooks.\n"
 "Нажмите кнопку \"Показать детали\" для списка."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -853,31 +862,31 @@ msgstr ""
 "Некоторые обложки не могут быть преобразованы.\n"
 "Нажмите кнопку \"Показать детали\" для списка."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Новости"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Каталог"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Соединиться с iTunes"
 
@@ -928,20 +937,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Получение списка книг с устройства..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Передача книги на устройство..."
 
@@ -949,8 +958,8 @@ msgstr "Передача книги на устройство..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Добавление книги в список метаданных устройства..."
 
@@ -960,8 +969,8 @@ msgstr "Добавление книги в список метаданных у
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Удаление книги с устройства..."
 
@@ -969,17 +978,17 @@ msgstr "Удаление книги с устройства..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Удаление книги из списка метаданных устройства..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Отправка метаданные на устройство..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK не установлен"
 
@@ -1157,6 +1166,10 @@ msgid ""
 "the Kindle when uploading MOBI files by USB. Note that the page numbers do "
 "not correspond to any paper book."
 msgstr ""
+"Kindle 3 и новее могут использовать информацию о номерах страниц в MOBI-"
+"файлах. С этой опцией calibre посчитает и отправит эту информацию на Kindle "
+"во время выгрузки MOBI-файлов через USB. Обратите внимание, что номера "
+"страниц не соотвествуют какой-либо бумажной книге."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:187
 msgid "Use slower but more accurate page number generation"
@@ -1169,6 +1182,10 @@ msgid ""
 "book. However, this method is slower and will slow down sending files to the "
 "Kindle."
 msgstr ""
+"Существует два способа генерировать информация о номерах страниц. "
+"Использование более аккуратного генератора даст страницы, которые лучше "
+"соотвествуют печатной книге. Однако, этот метод медленее и создаст задержки "
+"в отправке файлов в Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:257
 msgid "Communicate with the Kindle DX eBook reader."
@@ -1285,15 +1302,15 @@ msgstr "Соединиться с Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Соединиться с Sony"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "по названию"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Все, автор которых"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1301,18 +1318,18 @@ msgstr ""
 "Разделенный запятыми список полей метаданных преобразовать в коллекции на "
 "устройстве. Возможности включают: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Загрузите разные иконки обложек для книг (новые ридеры)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1326,29 +1343,40 @@ msgstr ""
 "настройку можно использовать только с новыми ридерами SNOY 350, 650 и 950 "
 "или новее."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1486,7 +1514,7 @@ msgstr "Дополнительная настройка"
 msgid "Communicate with an eBook reader."
 msgstr "Соединиться с электронной книгой."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Получение информацию об устройстве..."
 
@@ -2269,7 +2297,7 @@ msgstr "Конвертирую входной файл в HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Выполняю преобразования книги..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Создаю"
 
@@ -2421,7 +2449,7 @@ msgstr "Начать"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Не вставлять содержание в начало книги."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2432,6 +2460,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2836,105 +2868,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "ОШИБКА ШАБЛОНА"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Нет"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Да"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Заголовок"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Издатель"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Спонсор"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Комментарии"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Теги"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Серия"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Язык"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Временная метка"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Опубликовано"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Права"
 
@@ -3358,7 +3390,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Источник метаданных"
 
@@ -3493,7 +3525,7 @@ msgid "HTML TOC generation options."
 msgstr "Варианты создания HTML содержания"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3689,6 +3721,7 @@ msgid "Author"
 msgstr "Автор"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Тема"
 
@@ -3998,85 +4031,89 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "По умолчанию, отправлять файл в карту памяти, вместо основной памяти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Подтвердить перед удалением"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Геометрия основного окна"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Сообщить, если доступна новая версия"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Использовать Римские цифры для нумерации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Сортировать список меток по названию, популярности, или рейтингу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Количество обложек показываемых в режиме просмотра обложек"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "По умолчанию преобразование в LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Опции для просмотра электронной книги LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Форматы для просмотра во встроенной программе"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Показывать колонки в списке книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Автоматически запускать сервер конента при запуске приложения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "В базе данных содержатся старые новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Показывать иконку в панели задач"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Загрузить в устройство закаченные новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Удалить книги из библиотеки после загрузки в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "Показать обложку в отдельном окне вместо основного окна calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Отключить уведомления от иконки в трее"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "Действие по умолчанию при нажатии кнопки \"отправить в устройство\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4084,53 +4121,53 @@ msgstr ""
 "Начать поиск по мере ввода. Если этот параметр отключен, то поиск будет "
 "происходить только, при нажатии клавиш Enter или Return."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Максимальное количество ожидающих рабочих процессов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Скачать социальные метаданные (тэги/оценки/и т.д.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Заменять автора и название новыми метаданными"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Автоматическая загрузка обложки, если таковая имеются"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 "Ограничить максимальное количество одновременных задач количеством "
 "процессоров CPU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Схема размещения пользовательского интерфейса"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Показывать средний рейтинг в просмотрщике меток"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Отключить анимацию пользовальского интерфейса"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "пометить категории просмотра для неотображения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Выберите файлы"
 
@@ -4345,8 +4382,8 @@ msgstr "Только пользовательские аннотации из о
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Нет Выбранных книг"
@@ -4382,7 +4419,7 @@ msgstr "<b>Позиция %d &bull; %s</b><br />"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:20
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:34
 msgid "Create a catalog of the books in your calibre library"
-msgstr ""
+msgstr "Создать каталог книг в вашей библиотеке calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:31
 msgid "No books selected for catalog generation"
@@ -4436,7 +4473,7 @@ msgstr "Удалить библиотеку"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:109
 msgid "Pick a random book"
-msgstr ""
+msgstr "Выбрать случайную книгу"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:128
 msgid "Library Maintenance"
@@ -4546,7 +4583,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4614,7 +4651,7 @@ msgid "Bulk convert"
 msgstr "Общее преобразование"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Не преобразуется"
 
@@ -4622,7 +4659,7 @@ msgstr "Не преобразуется"
 msgid "Starting conversion of %d book(s)"
 msgstr "Подготовка к конвертированию %d книг(и)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 "Пустой выходной файл, возможно процесс преобразования завершился аварийно"
@@ -4807,7 +4844,7 @@ msgid "Stop Content Server"
 msgstr "Остановить контент сервер"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Отправить по электронной почте к"
 
@@ -4815,32 +4852,32 @@ msgstr "Отправить по электронной почте к"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(Удалить из библиотеки)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Настроить общий доступ к книгам на основе электронной почты"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Отправить в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Подключиться/общий доступ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Остановка"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4928,26 +4965,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Загрузка {0} для {1} книг(и)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Невозможно редактировать метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Не удается объединить книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "Необходимо выбрать как минимум две книги для объединения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr "Вы хотите объединить более 5 книг. Вы уверены что хотите продолжить?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4955,7 +4992,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4967,7 +5004,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4978,19 +5015,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Скачать новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Вызвать новость из "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " загружено."
 
@@ -5055,13 +5092,13 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Запустить стартовый мастер"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:28
 msgid "Restart in debug mode"
-msgstr "Перезагрузка в режиме отладки"
+msgstr "Перезапустить в режиме отладки"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:43
 msgid "Cannot configure while there are running jobs."
@@ -5069,7 +5106,7 @@ msgstr "Пока запущено задание, не могу настроит
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:48
 msgid "Cannot configure before calibre is restarted."
-msgstr "Невозможно сконфигурировать до перезагрузки calibre."
+msgstr "Невозможно сконфигурировать пока calibre не будет перезапущен."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/restart.py:14
 msgid "&Restart"
@@ -5221,11 +5258,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:24
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:31
 msgid "View"
-msgstr "Вид"
+msgstr "Просмотр"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:32
 msgid "View specific format"
-msgstr "Просмотреть особый формат"
+msgstr "Просмотреть конкретный формат"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:38
 msgid "Read a random book"
@@ -5303,7 +5340,7 @@ msgid "The specified directory could not be processed."
 msgstr "Специальных каталог не может быть обработан."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Нет книг"
 
@@ -5324,8 +5361,8 @@ 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 ""
-"Добавление книг видимо зависло. Попробуйте перезапустить calibre и добавить "
-"книги меньшими порциями до тех пор пока не найдете проблемную книгу."
+"Процесс добавления книг, видимо, завис. Попробуйте перезапустить calibre и "
+"добавить книги меньшими порциями до тех пор пока не найдете проблемную книгу."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:368
 msgid "Duplicates found!"
@@ -5521,8 +5558,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Путь"
 
@@ -5532,17 +5569,17 @@ msgstr "Путь"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Форматы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Коллекции"
 
@@ -5552,25 +5589,25 @@ msgid "Click to open"
 msgstr "Щелкните, чтобы открыть"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Ничего"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Вставить обложку"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Копировать обложку"
 
@@ -5628,7 +5665,7 @@ msgstr "вывод"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5651,14 +5688,14 @@ msgstr "вывод"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6241,10 +6278,14 @@ msgstr "Не вставлять &Содержание в начало книги
 msgid "FB2 Output"
 msgstr "Вывод FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Мастер масштабирования шрифта"
@@ -6847,7 +6888,7 @@ msgid "Regex:"
 msgstr "Регулярное выражение:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Тест"
 
@@ -7439,21 +7480,21 @@ msgstr "Ошибка"
 msgid "Error communicating with device"
 msgstr "Ошибка подключения с устройством"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Нет подходящего формата"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Указать папку для открытия в качестве устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Ошибка согласования устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7461,67 +7502,67 @@ msgstr ""
 "Была временная ошибка общения с устройством. Пожалуста, переподключите "
 "устройство или перегрузите его."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Устройство: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " определено."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "Отослать выбранное"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i из %i книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 из %i книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Выберите формат для отправки в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Нет устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Устройство не подсоединено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Нет карточки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Не могу передать: в устройстве нет карты памяти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Автоматически конвертировать книги до загрузки в устройство?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Отправляем каталоги в устройство."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Отправляются новости на устройство."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Отправка книги в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7530,11 +7571,11 @@ msgstr ""
 "формата. Переконвертируйте книгу(и) в формат поддерживаемый вашим "
 "устройством."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Нет места на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7823,7 +7864,7 @@ msgstr "Выбрать формат"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Формат"
 
@@ -7902,7 +7943,7 @@ msgstr "Создать пустую библиотеку по указанном
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:82
 msgid "&Copy structure from the current library"
-msgstr ""
+msgstr "&Копировать структуру из текущей библиотеки"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:83
 msgid ""
@@ -7959,7 +8000,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -8006,8 +8047,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8039,12 +8080,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -8232,22 +8273,22 @@ msgid "Working"
 msgstr "Работа"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Нижний регистр"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Верхний регистр"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9741,12 +9782,12 @@ msgid "%s (was %s)"
 msgstr "%s (было %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9815,7 +9856,7 @@ msgid "Send test mail from %s to:"
 msgstr "Отправить пробное сообщение от %s к:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Тест"
 
@@ -10059,61 +10100,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Новости:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Прикреплено, Вы найдете e-book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "от"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "в %s формате."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Отправка электронной почты"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "Автоматически конвертировать книги до отправки по электронной почте?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "Не могу отправить эти книги, т.к. не найдено подходящих форматов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Отослать новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10127,67 +10168,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Регулярное &выражение"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Имя файла:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Обычный параметр (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Нет совпадений"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Авторы:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Регулярное выражение (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Серии:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Обычный параметр (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Индекс серии:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Обычный параметр (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Обычный параметр (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10395,48 +10454,48 @@ msgstr "Д"
 msgid "Edit template"
 msgstr "Изменить шаблон"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "На устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Размер (МБ)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Книга %s из %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "В Библиотеке"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Размер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Отмечено для удаления"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Дважды кликните по <b>редактировать</b><br><br>"
 
@@ -10502,7 +10561,7 @@ msgstr "Перенести"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:55
 msgid "<b>Changes will only take effect after a restart.</b>"
-msgstr "<b>Изменения применятся только после перезагрузки.</b>"
+msgstr "<b>Изменения вступят в силу только после перезапуска.</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
@@ -10513,7 +10572,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Нет совпадений</b> для искомой фразы <i>%s</i> ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Совпадений не найдено"
 
@@ -10530,12 +10589,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Панель промотра LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Следующая страница"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Предыдущая страница"
 
@@ -11361,21 +11420,28 @@ msgstr "По умолчанию"
 msgid "&Remove email"
 msgstr "Удалить email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Автоотправка"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Электронная почта"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 "Форматы для отправки электронной почтой. Первый подходящий формат будет "
 "отослан."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11384,7 +11450,7 @@ msgstr ""
 "этому адресу электронной почты (в случае если имеется один из перечисленных "
 "форматов)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "новый адрес электронной почты"
 
@@ -11396,95 +11462,94 @@ msgstr "Узкий"
 msgid "Wide"
 msgstr "Широкий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Средний"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Маленький"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Большой"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Всегда"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Никогда"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "По первой букве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Отключено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 "Расположение элементов пользовательского интерфейса (требует перезапуска):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
-"Количество обложек показываемых в режиме просмотра (нужна перезагрузка "
-"calibre)"
+"&Количество обложек показываемых в режиме просмотра (необходим перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
-msgstr "Выбрать &язык (необходим рестарт):"
+msgstr "Выбрать &язык (требуется перезапуск):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Показывать средний рейтинг в просмотрщике меток"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Отключить всю анимацию. Применительно если у вас медленный/старый компьютер."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Отключить анимацию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
-msgstr "использовать иконку в трее (необходим перезапуск)"
+msgstr "использовать иконку в &трее (необходим перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Показывать заставку при запуске"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Запретить &уведомления в системном трее"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Использовать &Римские цифры для серий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Показывать &обложку в отдельном окне (нужен перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11498,11 +11563,11 @@ msgstr ""
 "список групп фиксированного размера. Установите \"запрещено\",\n"
 "если вы никогда не хотите видеть подкатегории."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -11513,11 +11578,11 @@ msgstr ""
 "\"запрещено,\n"
 "то это значение будет игнорировано."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11527,52 +11592,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Панель инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Размер иконок:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Показывать &текст под иконками:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "Ра&зделить панель инструментов на две панели"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Шрифт интерфейса:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Изменить &шрифт (необходим перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Применить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "&Восстановить настройки по-умолчанию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11580,7 +11641,7 @@ msgstr ""
 "Некоторые из сделанных вами измененией требуют перезапуска. Пожалуйста "
 "презапустите calibre как можно скорее."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11588,10 +11649,10 @@ msgstr ""
 "Изменения которые вы сделали требют немедленного перезапуска calibre. Вам "
 "запрещено менять настройки, пока вы не перезапустите программу."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
-msgstr "Требуется перезапуска"
+msgstr "Необходим перезапуск"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:42
 msgid "Failed to install command line tools."
@@ -11615,6 +11676,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:61
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
+"&Максимальное число рабочих процессов в режиме ожидания (необходим перезпуск)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:62
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
@@ -12098,7 +12160,7 @@ msgstr "Лог доступа:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:133
 msgid "You need to restart the server for changes to take effect"
-msgstr ""
+msgstr "Вы должны перезагрузить сервер, чтобы изменения вступили в силу"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:124
 msgid "Server &port:"
@@ -12340,30 +12402,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12460,7 +12526,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Найти"
@@ -12555,166 +12621,166 @@ msgstr "Щёлкните для изменения"
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Переименовать %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Показать категорию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Управление %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Управление сохраненными поисками"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
-msgstr "Управлять пользовательскими категориями"
+msgstr "Управление пользовательскими категориями"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Показать все категории"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr "Новая категория"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr "Удалить категорию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
-msgstr ""
+msgstr "Найти элементы в браузере тэгов."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12724,60 +12790,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Свернуть все категории"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Сортировать по имени"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Сортировать по популярности"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Сортировать по средней оценке"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "Устанавливает порядок сортировки для записей в Tag Browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Сравнить все"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Сравнить некоторые"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
-msgstr ""
+msgstr "Управление &пользовательскими категориями"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12854,23 +12920,23 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Ошибка преобразования"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Имеется активное задание. Вы все равно хотите выйти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -12880,11 +12946,11 @@ msgstr ""
 "                      Выход может вызвать искажение на устройстве.<br>\n"
 "                      Вы действительно уверены, что хотите выйти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13088,7 +13154,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Опции настроек ebook вьювера"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -13167,36 +13233,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Перейти..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Следующий раздел"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Предыдущий раздел"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Начало документа"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Конец документа"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Начало раздела"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Конец раздела"
 
@@ -13273,74 +13339,74 @@ msgstr "Предварительный просмотр"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Выбрать электронную книгу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Электронная книга"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Нет соответствий для: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Загрузить поток..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Разметка %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Добавить закладку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Введите название закладки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Управление закладками"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Загружается электронная книга..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Не могу открыть электронную книгу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Опции управления ebook вьювером"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Если указано, окно вьювера будт пытаться всплыть наверх при открытии."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13415,27 +13481,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Печать книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Изменить регистр"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Показать"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Скрыть"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13626,6 +13692,9 @@ msgid ""
 "your %s email address to the allowed email addresses in your Amazon.com "
 "Kindle management page."
 msgstr ""
+"Если Вы планируете использовать электронную почту чтобы отправлять книги на "
+"ваш Kindle, не забудьте добавить свой адрес электронной почты %s в "
+"разрешённые на вашей странице управления Kindle на Amazon.com."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:187
 msgid "Setup"
@@ -14689,11 +14758,11 @@ msgstr ""
 "\n"
 "Для справки: %%prog команда --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14707,15 +14776,15 @@ msgstr "%s Средня оценка %3.1f"
 msgid "Main"
 msgstr "Основная"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Миграция старой базы данных в %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Копирование <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Сжатие базы данных"
 
@@ -15760,95 +15829,95 @@ msgstr "Не загружать последнюю версию встроенн
 msgid "Unknown News Source"
 msgstr "Неизвестный новостной ресурс"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Рецепт \"%s\" требует имя пользожателя и пароль"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Закачка завершена"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Неудачная загрузка следующих статей:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "Неудачная загрузка частей следующих статей:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " из "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tБитые ссылки:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Вызываются заготовки..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Получить заготовки для оглавления"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Попытка скачать обложку..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Создаем титульные данные..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Начало загрузки [%d поток(и)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Заготовки закачиватся в %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Невозможно скачать обложку: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Скачивается обложка из %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Выходные данные изображения загрузили"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Статья без названия"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Статья скачена: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Ошибка загрузки статьи: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Доставляется материал"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -15856,7 +15925,7 @@ msgstr ""
 "Не удалось выполнить вход, проверьте свое имя пользователя и пароль для "
 "службы Периодических изданий Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16327,9 +16396,6 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Read &metadata from files"
 #~ msgstr "Читать &метаданные из файла"
 
-#~ msgid "Toolbar"
-#~ msgstr "Панель инструментов"
-
 #~ msgid "Chapter Detection"
 #~ msgstr "Распознавание главы"
 
@@ -18140,6 +18206,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 #~ msgstr "Этот профиль предназначен для линейки SONY PRS: 500/505/700 и т.д."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Не найден подходящий модуль в "
+
 #~ msgid "Communicate with the Cybook eBook reader."
 #~ msgstr "Соединяться с Cybook."
 
@@ -18792,6 +18861,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "You cannot change libraries when a device is connected."
 #~ msgstr "Вы не можете сменить библиотеку пока устройство подключено."
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Настройка панели инструментов"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Соединиться с Kogan"
 
@@ -18873,3 +18945,9 @@ msgstr "Не скачивать файлы стилей CSS."
 
 #~ msgid "Collapse when more items than:"
 #~ msgstr "Сворачивать если елементов больше чем:"
+
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "Ра&зделить панель инструментов на две панели"
+
+#~ msgid "Customize searching"
+#~ msgstr "Настроить поиск"
diff --git a/src/calibre/translations/sc.po b/src/calibre/translations/sc.po
index 329cb73f53..1d9365015d 100644
--- a/src/calibre/translations/sc.po
+++ b/src/calibre/translations/sc.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-12-11 02:46+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Sardinian <sc@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: 2011-03-27 04:48+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:51+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Does absolutely nothing"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Does absolutely nothing"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Does absolutely nothing"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Does absolutely nothing"
 msgid "Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/sk.po b/src/calibre/translations/sk.po
index 58c9bc3b3a..07c9f0d3df 100644
--- a/src/calibre/translations/sk.po
+++ b/src/calibre/translations/sk.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-09-24 20:37+0000\n"
 "Last-Translator: martinr <rovnakm@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-27 04:47+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:50+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Nerobí vôbec nič"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Nerobí vôbec nič"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Nerobí vôbec nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Nerobí vôbec nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Nerobí vôbec nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Nerobí vôbec nič"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Nerobí vôbec nič"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Nerobí vôbec nič"
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Základ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Nemožno nastaviť"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Typ súboru"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Vstupné metadátové"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Výstupné metadátové"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generátor katalógu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Užívateľská akcia"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Nastavenia"
@@ -335,8 +335,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Pridať / odstrániť svoje vlastné stĺpce v calibre zozname kníh"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Prispôsobiť lištu nástrojov"
+msgid "Toolbar"
+msgstr "Panel nástrojov"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -347,7 +347,7 @@ msgstr ""
 "dostupnými akciami k dispozícii."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -676,35 +676,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Inštalované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Priradenie modulov k formátom súborov"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Úprava lokálnych modulov"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Neaktívne moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Povolené moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Nebol nájdený žiadny platný modul v "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicializácia modulu %s zlyhala s chybou:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -716,30 +712,30 @@ msgstr ""
 "    Nastaviť calibre nahraním externých pluginov.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Pridajte modul zadaním cesty k ZIP archívu v ktorom sa nachádza."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Odstrániť modul podľa mena. Vstavané moduly nie je možné odstrániť."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 "Upraviť modul. Zadajte názov modulu, za ním čiarku a reťazec s úpravami."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Vypísať všetky inštalované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Aktivovať modul podľa mena"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Deaktivovať modul podľa mena"
 
@@ -763,69 +759,81 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Komunikácia s S60 telefónmi"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Použiť Seriu ako Kategóriu v iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Načítať obálky z iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Komunikácia s iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Apple zariadenie detekované, spúšťam iTunes, prosím čakajte ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Aktualizácia zoznamu metadát zariadenia.."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d z %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "Dokončené"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -835,7 +843,7 @@ msgstr ""
 "Zmazané použitím iBooks aplikáciou.\n"
 "Klikni na \"Ukázať detaily\" pre výpis."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -843,31 +851,31 @@ msgstr ""
 "Niektoré obálky nemôžu byť skonvertované\n"
 "Klikni na \"Ukázať detaily\" pre výpis."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Novinky"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalóg"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Komunikácia s iTunes."
 
@@ -911,20 +919,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Preberám zoznam kníh zo zariadenia..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Prenos kníh do zariadenia..."
 
@@ -932,8 +940,8 @@ msgstr "Prenos kníh do zariadenia..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Pridávam knihy do zoznamu v zariadení..."
 
@@ -943,8 +951,8 @@ msgstr "Pridávam knihy do zoznamu v zariadení..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Odstraňujem knihy zo zariadenia..."
 
@@ -952,17 +960,17 @@ msgstr "Odstraňujem knihy zo zariadenia..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Odoberám knihy zo zoznamu v zariadení..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Odosielam knihy do zariadenia..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1265,15 +1273,15 @@ msgstr "Komunikácia so zariadením Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Komunikácia s všetkými Sony eBook čítačkami."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1281,18 +1289,18 @@ msgstr ""
 "Čiarkou oddelený zoznam polí metaúdajov vkladaných do zbierky na prístroji. "
 "Možnosti sú: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1301,29 +1309,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1456,7 +1475,7 @@ msgstr "Extra nastavenia"
 msgid "Communicate with an eBook reader."
 msgstr "Komunikácia s čítacím zariadením."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Preberám informácie o zariadení..."
 
@@ -2189,7 +2208,7 @@ msgstr "Konverzia vstupu do HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Prebieha transformácia e-knihy..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Vytváram"
 
@@ -2325,7 +2344,7 @@ msgstr "Štart"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Nevkladajte Obsah na začiatku knihy."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2336,6 +2355,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2720,105 +2743,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Názov"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Vydavateľ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Poznámky"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Tagy"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Séria"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Jazyk"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Časová známka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Publikované"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Práva"
 
@@ -3212,7 +3235,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3348,7 +3371,7 @@ msgid "HTML TOC generation options."
 msgstr "voľby HTML TOC generovania."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3519,6 +3542,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Predmet"
 
@@ -3785,136 +3809,140 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "Ukladať súbory na pamäťovú kartu, nie do hlavnej pamäte zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Vyžadovať potvrdenie pred zmazaním"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Usporiadanie hlavného okna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Upozorniť ak je k dispozícii nová verzia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Číslovanie kníh v sérii Rímskymi číslicami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Počet obálok, ktoré sa majú zobraziť v režime prezerania obálok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Štandardné nastavenie prevodu do formátu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Možnosti prehliadača elektronických kníh vo formáte LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formáty zobrazené interným prehliadačom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Počet stĺpcov v zozname kníh"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Automaticky spúšťať obsahový server pri štarte aplikácie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Najstaršie správy ponechané v databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Zobraziť ikonu v systémovej lište"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Odoslať prevzaté správy do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Zmazať knihy z knižnice po ich odoslaní do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 "Zobraziť galériu obálok v oddelenom okne namiesto hlavného okna calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Vypnúť upozornenia zobrazované ikonou v systémovej lište"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -4127,8 +4155,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nie sú označené žiadne knihy"
@@ -4325,7 +4353,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4391,7 +4419,7 @@ msgid "Bulk convert"
 msgstr "Previesť dávkovo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Nemôžem previesť"
 
@@ -4399,7 +4427,7 @@ msgstr "Nemôžem previesť"
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4580,7 +4608,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4588,32 +4616,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Odoslať do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4700,26 +4728,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Nemožno upraviť metadáta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4727,7 +4755,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4739,7 +4767,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4750,19 +4778,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Prevziať správy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Preberám správy z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " prevzaté."
 
@@ -4827,7 +4855,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -5070,7 +5098,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5272,8 +5300,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Cesta"
 
@@ -5283,17 +5311,17 @@ msgstr "Cesta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formáty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5303,25 +5331,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Žiadne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5379,7 +5407,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5402,14 +5430,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5974,10 +6002,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6572,7 +6604,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7157,21 +7189,21 @@ msgstr "Chyba"
 msgid "Error communicating with device"
 msgstr "Chyba komunikácie so zariadením"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Žiadne vhodné formáty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Chyba komunikácie so zariadením"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7179,77 +7211,77 @@ msgstr ""
 "Dočasná chyba komunikácie so zariadením. Prosím odpojte a znovu pripojte "
 "zariadenie a/alebo reštartujte počítač."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Zariadenie: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " nájdené."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Vyberte formát na poslanie do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Odosielam správy do zariadenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Odosielam knihy do zariadenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Prekročená kapacita zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7537,7 +7569,7 @@ msgstr "Vyberte formát"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Formát"
 
@@ -7673,7 +7705,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7720,8 +7752,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7753,12 +7785,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7942,22 +7974,22 @@ msgid "Working"
 msgstr "Pracuje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9447,12 +9479,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9521,7 +9553,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Test"
 
@@ -9766,61 +9798,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9834,67 +9866,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Regulárny &výraz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Názov súboru:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Názov:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regulárny výraz (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Žiadna zhoda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Séria:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regulárny výraz (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Poradie v sérii:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regulárny výraz (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regulárny výraz (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10102,48 +10152,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Veľkosť (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10220,7 +10270,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "Pre hľadaný výraz <i>%s</i> neboli nájdené <b>žiadne výsledky</b>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Neboli nájdené žiadne výsledky"
 
@@ -10237,12 +10287,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Nástrojová lišta prehliadača LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Nasledujúca strana"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Predchádzajúca strana"
 
@@ -11052,25 +11102,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -11082,92 +11139,92 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Stredné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Malé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Veľké"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "Počet &obálok zobrazovaných v prehliadači (vyžaduje reštart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Vyberte &jazyk (vyžaduje reštart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Zobraziť &ikonu v systémovej lište"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Zobraziť prehliadač &obálok v oddelenom okne (vyžaduje reštart programu)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11176,22 +11233,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11201,64 +11258,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11999,30 +12052,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12119,7 +12176,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Hľadať"
@@ -12212,166 +12269,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12381,60 +12438,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Nájsť všetky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Nájsť ktorékoľvek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12507,34 +12564,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Chyba prevodu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Prebieha spracovanie úloh. Určite chcete program ukončiť?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12736,7 +12793,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Možnosti úpravy prehliadača elektronických kníh"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12815,36 +12872,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Prejsť na..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12920,73 +12977,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Vyberte elektronickú knihu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "Elektronické knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Neboli nájdené žiadne výsledky pre: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Načítavam prúd..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Formátujem %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Pridať záložku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Zadajte názov záložky:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Načítavam elektronickú knihu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Nepodarilo sa otvoriť knihu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Nastavenie prehliadača elektronických kníh"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13061,27 +13118,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14326,11 +14383,11 @@ msgstr ""
 "\n"
 "Informácie o jednotlivých príkazoch: %%prog príkaz --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14344,16 +14401,16 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Migrujem starú databázu do knižnice elektronických kníh v %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopírujem <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Zmenšujem databázu"
 
@@ -15393,101 +15450,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Neznámy zdroj správ"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Preberanie ukončené"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Zlyhalo preberanie nasledovných článkov:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "Zlyhalo preberanie niektorých častí nasledovných článkov:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " od "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tNeplatné odkazy:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Preberám prúdy..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Získané prúdy z hlavnej stránky"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Preberám obálku..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Začína preberanie [počet vlákien: %d]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Prúdy boli uložené do %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Nepodarilo sa prevziať obálku: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Preberám obálku z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Článok bez názvu"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Prebratý článok: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Zlyhalo preberanie článku: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Preberám prúd"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16283,9 +16340,6 @@ msgstr "Nepreberať kaskádové štýly."
 #~ msgid "Use &Roman numerals for series number"
 #~ msgstr "Číslovať knihy v sérii &Rímskymi číslicami"
 
-#~ msgid "Toolbar"
-#~ msgstr "Panel nástrojov"
-
 #~ msgid "Remove a directory from the frequently used directories list"
 #~ msgstr "Odobrať adresár zo zoznamu často používaných"
 
@@ -16446,6 +16500,9 @@ msgstr "Nepreberať kaskádové štýly."
 #~ "Webovú %s stránku je potrebné najprv uložiť ako HTML súbor, potom previesť "
 #~ "programom html2lrf."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Nebol nájdený žiadny platný modul v "
+
 #~ msgid "Output written to "
 #~ msgstr "Výstup zapísaný do "
 
@@ -17745,6 +17802,9 @@ msgstr "Nepreberať kaskádové štýly."
 #~ msgid "Downloads series/tags/rating information from librarything.com"
 #~ msgstr "Download sérií/značiek/hodnotiacích informácií z librarything.com"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Prispôsobiť lištu nástrojov"
+
 #~ 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."
diff --git a/src/calibre/translations/sl.po b/src/calibre/translations/sl.po
index ec813f3bef..c3fd0d3eaf 100644
--- a/src/calibre/translations/sl.po
+++ b/src/calibre/translations/sl.po
@@ -6,25 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.49\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-31 12:13+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-02 09:51+0000\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-01 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-04-03 04:38+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Ne stori ničesar"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -35,7 +35,7 @@ msgstr "Ne stori ničesar"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -52,9 +52,9 @@ msgstr "Ne stori ničesar"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -74,7 +74,7 @@ msgstr "Ne stori ničesar"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -120,19 +120,19 @@ msgstr "Ne stori ničesar"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -140,12 +140,12 @@ msgstr "Ne stori ničesar"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -156,11 +156,11 @@ msgstr "Ne stori ničesar"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -174,46 +174,46 @@ msgstr "Ne stori ničesar"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Osnovno"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Prilagodi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Ni mogoče prilagoditi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Vrsta datoteke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Bralnik metapodatkov"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Pisalnik metapodatkov"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generator katalogov"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Dejanje uporabniškega vmesnika"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Nastavitve"
@@ -337,8 +337,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Dodajte/odstranite lastne stolpce v seznamu knjig calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Prilagodite orodno vrstico"
+msgid "Toolbar"
+msgstr "Orodna vrstica"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -349,8 +349,8 @@ msgstr ""
 "dejanja v obeh"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Prilagodite iskanje"
+msgid "Searching"
+msgstr "Iskanje v teku ..."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -681,35 +681,31 @@ msgstr "Ta profil je namenjen napravi B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Ta profil je namenjen napravi Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Nameščeni vtičniki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapiranje vtičnikov po tipu datotek"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Krajevno prilagajanje vtičnikov"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Onemogočeni vtičniki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Omogočeni vtičniki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Ni veljavnih vtičnikov v "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicializacija vtičnika %s s sledljivostjo za nazaj ni uspela:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -721,16 +717,16 @@ msgstr ""
 "    Prikrojitev calibre z nalaganjem zunanjih vtičnikov.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Dodajte vtičnik z določitvijo poti do datoteke zip, ki ga vsebuje."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Odstranite vtičnik po njegovem imenu. To ne vpliva na vgrajene vtičnike."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -738,15 +734,15 @@ msgstr ""
 "Preurejanje vtičnika. Določite ime vtičnika in preurejene stringe ter jih  "
 "ločite z vejico."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Prikaži vse nameščene vtičnike"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Omogoči imenovan vtičnik"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Onemogoči imenovan vtičnik"
 
@@ -770,43 +766,58 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Povezovanje s telefoni S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr "Onemogoči gonilnik Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr "Omogoči gonilnik Apple"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Uporabite Series kot Kategorijo v iTunes/Knjigah"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
+"Omogočite, če želite uporabiti ime zbirke kot žanr v iTunes ali kategorijo "
+"iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Naslovnice v predpomnilniku iz iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
+"Omogočite, če želite medpomniti in prikazati naslovnice iz iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr "Preskoči predlog 'Poveži z iTunes'"
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Naprava Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Povezovanje z iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Zaznana naprava Apple, zaganjanje iTunes ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -814,27 +825,27 @@ msgstr ""
 "Kopiranje knjig neposredno z iNaprave ni možno. Povlecite knjižnico iTunes "
 "na namizje in ga od tam dodajte v okno Knjižnica programa calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Posodabljanje seznama metapodatkov naprave ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d od %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "končano"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -844,7 +855,7 @@ msgstr ""
 "Izbrišite jih s programom iBooks.\n"
 "Kliknite 'Pokaži podrobnosti' za seznam."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -852,31 +863,31 @@ msgstr ""
 "Določenih naslovnic ni bilo mogoče pretvoriti.\n"
 "Kliknite 'Pokaži podrobnosti' za seznam."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Novice"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Povezovanje z iTunes."
 
@@ -926,20 +937,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Pridobivanje seznama knjig na napravi ..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Prenašanje knjig na napravo ..."
 
@@ -947,8 +958,8 @@ msgstr "Prenašanje knjig na napravo ..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Dodajanje knjig na seznam metapodatkov naprave..."
 
@@ -958,8 +969,8 @@ msgstr "Dodajanje knjig na seznam metapodatkov naprave..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Odstranjevanje knjig z naprave ..."
 
@@ -967,17 +978,17 @@ msgstr "Odstranjevanje knjig z naprave ..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Odstranjevanje knjig iz seznama metapodatkov naprave ..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Pošiljanje metapodatkov napravi ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "SDK Bambook še ni nameščen."
 
@@ -1130,11 +1141,11 @@ msgstr "Povezovanje z bralnikom JetBook Mini."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/apnx.py:28
 msgid "Not a valid MOBI file. Reports identity of %s"
-msgstr ""
+msgstr "Ni veljavna datoteka MOBI. Javlja identiteto %s"
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/apnx.py:44
 msgid "Could not generate page mapping."
-msgstr ""
+msgstr "Preslikave strani ni mogoče ustvariti."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:44
 msgid "Communicate with the Kindle eBook reader."
@@ -1146,7 +1157,7 @@ msgstr "Povezovanje z bralnikom e-knjig Kindle 2/3."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:180
 msgid "Send page number information when sending books"
-msgstr ""
+msgstr "Pri pošiljanju knjig pošlji podatke o številkah strani"
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:182
 msgid ""
@@ -1167,6 +1178,9 @@ msgid ""
 "book. However, this method is slower and will slow down sending files to the "
 "Kindle."
 msgstr ""
+"Obstajata dva načina izdelave podatkov o številkah strani. Bolj natančni "
+"generator izdela strani, ki bolje ustrezajo stranem v tiskani knjigi. Vendar "
+"pa je ta metoda počasnejša in upočasni pošiljanje datotek na Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:257
 msgid "Communicate with the Kindle DX eBook reader."
@@ -1282,15 +1296,15 @@ msgstr "Povezovanje z bralnikom e-knjig Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Povezovanje z vsemi bralniki e-knjig Sony."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Vse po naslovih"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Vse po avtorjih"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1298,7 +1312,7 @@ msgstr ""
 "Seznam polj metapodatkov za vnos v zbirke na napravi, ločen z vejico. Med "
 "možnostmi so naslednje: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1308,11 +1322,11 @@ msgstr ""
 "seznam in ju omogočite. Zbirki bosta poimenovani z imenom, ki sledi znaku "
 "\":\"."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Prenesi ločene sličice naslovnic za knjige (za novejše bralnike)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1321,29 +1335,44 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
+"Osveži ločene platnice pri uporabi samodejnega upravljanja (novejši bralniki)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Ohrani razmerje stranic naslovnice pri izdelavi predoglednih slik"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr "Išči knjige v vseh mapah"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+"S takšno nastavitvijo calibre išče knjige v vseh mapah naprave in njenih "
+"karticah. S tem calibre najde knjige, ki so na napravo prišle z drugimi "
+"programi ali brezžičnim prenosom."
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1478,7 +1507,7 @@ msgstr "Posebna prilagoditev"
 msgid "Communicate with an eBook reader."
 msgstr "Povezovanje z bralnikom e-knjig."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Pridobi podatke o napravi ..."
 
@@ -1599,6 +1628,8 @@ msgid ""
 "When converting a CBC do not add links to each page to the TOC. Note this "
 "only applies if the TOC has more than one section"
 msgstr ""
+"Pri pretvarjanju CBC vsaki strani ne dodaj povezav na kazalo vsebine. "
+"Upoštevajte, da to velja le, če ima kazalo vsebine več kot en razdelek"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:454
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:466
@@ -1678,6 +1709,9 @@ msgid ""
 "default. Use %s to enable.  Individual actions can be disabled with the %s "
 "options."
 msgstr ""
+"Spremeni besedilo dokumenta in strukturo z uporabo pogostih vzorcev. "
+"Privzeto onemogočeno. Uporabite %s, da jo omogočite. Posamezna dejanja so "
+"lahko onemogočena z možnostmi %s."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:153
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace.py:18
@@ -1980,6 +2014,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
+"Ko calibre odstrani razmik med odstavki, samodejno določi odmik odstavkov, s "
+"čimer zagotovi, da je mogoče odstavke enostavno razločiti. Ta možnost "
+"nadzira širino tega odmika."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:365
 msgid ""
@@ -2027,6 +2064,8 @@ msgid ""
 "Read metadata from the specified OPF file. Metadata read from this file will "
 "override any metadata in the source file."
 msgstr ""
+"Preberi metapodatke z navedene datoteke OPF. Iz te datoteke prebrani "
+"metapodatki bodo preglasili vse podatke iz izvorne datoteke."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:410
 msgid ""
@@ -2141,12 +2180,15 @@ msgstr ""
 msgid ""
 "Look for common words and patterns that denote italics and italicize them."
 msgstr ""
+"Išči pogoste besede in vzorce, ki označujejo ležečo pisavo, in postavi "
+"besedilo v ležečo lego."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:519
 msgid ""
 "Turn indentation created from multiple non-breaking space entities into CSS "
 "indents."
 msgstr ""
+"Pretvori odmike, ustvarjene z več neprelomnimi presledki, v odmike CSS."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:524
 msgid ""
@@ -2179,6 +2221,8 @@ msgid ""
 "Replace scene breaks with the specified text. By default, the text from the "
 "input document is used."
 msgstr ""
+"Nadomesti prelome prizorov z navedenim besedilom. Privzeto je uproabljeno "
+"besedilo iz vhodnega dokumenta."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:552
 msgid ""
@@ -2227,7 +2271,7 @@ msgstr "E-knjige v arhivu ni mogoče najti"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:747
 msgid "Values of series index and rating must be numbers. Ignoring"
-msgstr ""
+msgstr "Vrednosti indeksa zbirke in ocen morajo biti številske. Prezrto bo"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:754
 msgid "Failed to parse date/time"
@@ -2241,7 +2285,7 @@ msgstr "Pretvarjanje vhoda v HTML ..."
 msgid "Running transforms on ebook..."
 msgstr "Izvajanje preobliokvanj na e-knjigi ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Ustvarjanje"
 
@@ -2299,6 +2343,8 @@ 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 ""
+"Izlušči vsebino ustvarjene datoteke EPUB v navedeno mapo. Najprej se izbriše "
+"predhodna vsebina mape, zato bodite previdni."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
 msgid ""
@@ -2356,7 +2402,7 @@ msgstr "Začni"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Ne vstavi kazala vsebine na začetek knjige."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2367,6 +2413,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2742,105 +2792,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "NAPAKA PREDLOGE"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Ne"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Da"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Naslov"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Avtor(ji)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Založnik"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Opombe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Značke"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Zbirka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Jezik"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Časovni žig"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Objavljeno"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Pravice"
 
@@ -3231,7 +3281,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Vir metapodatkov"
 
@@ -3364,7 +3414,7 @@ msgid "HTML TOC generation options."
 msgstr "Možnosti tvorbe kazala vsebine za HTML"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3544,6 +3594,7 @@ msgid "Author"
 msgstr "Avtor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Tema"
 
@@ -3815,135 +3866,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Potrdite pred brisanjem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Geometrija glavnega okna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Opozori me, če je na voljo nova različica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Uporabi rimska števila za številko v zbirki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Razvrsti seznam značk po imenu, priljubljenosti ali oceni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Število naslovnic, ki se pokažejo v načinu brskanja med naslovnicami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Privzete nastavitve za pretvorbo v LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Možnosti za pregledovalnik e-knjig LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Stolpci, prikazani v seznamu knjig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Najstarejše novice, ohranjene v zbirki podatkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Pokaži ikono v sistemskem pladnju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Naloži prenesene novice na napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Po prenosu na napravo knjige izbriši iz knjižnice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Onemogoči opozorila v ikoni sistemskega pladnja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "Privzeto dejanje ob kliku gumba Pošlji na napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Največje število čakajočih delovnih procesov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Prenesi družabne metapodatke (značke/ocene/itn.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Prepiši avtorja in naslov z novimi metapodatki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Samodejno prenesi naslovnico, če je na voljo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Omeji največje število hkratnih opravil na število CPE"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Postavitev uporabniškega vmesnika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Izključi animacije vmesnika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Izberite datoteke"
 
@@ -4156,8 +4211,8 @@ msgstr "Uporabniške beležke, izdelane zgolj iz glavne knjižnice"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nobena od knjig ni izbrana."
@@ -4354,7 +4409,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4420,7 +4475,7 @@ msgid "Bulk convert"
 msgstr "Paketna pretvorba"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Pretvorba ni možna"
 
@@ -4428,7 +4483,7 @@ msgstr "Pretvorba ni možna"
 msgid "Starting conversion of %d book(s)"
 msgstr "Začetek pretvorbe %d knjig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4611,7 +4666,7 @@ msgid "Stop Content Server"
 msgstr "Ustavi strežnik vsebin"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4619,32 +4674,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(izbriši iz knjižnice)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Nastavi skupno rabo knjig po e-pošti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Pošlji na napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Poveži/skupna raba"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Ustavljanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4731,26 +4786,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Spreminjanje metapodatkov ni mogoče"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Knjig ni mogoče spojiti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "Najmanj dve knjigi morata biti izbrani za spajanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4758,7 +4813,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4770,7 +4825,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4781,19 +4836,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Pridobi novice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Pridobivanje novic z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4858,7 +4913,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Zaženi čarovnika dobrodošlice"
 
@@ -5100,7 +5155,7 @@ msgid "The specified directory could not be processed."
 msgstr "Navedene mape ni mogoče obdelati."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Ni knjig"
 
@@ -5302,8 +5357,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Pot"
 
@@ -5313,17 +5368,17 @@ msgstr "Pot"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Zapisi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Zbirke"
 
@@ -5333,25 +5388,25 @@ msgid "Click to open"
 msgstr "Odprite s klikom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Brez"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Prilepi naslovnico"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Kopiraj naslovnico"
 
@@ -5409,7 +5464,7 @@ msgstr "izhod"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5432,14 +5487,14 @@ msgstr "izhod"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6004,10 +6059,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr "Izvoz FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6602,7 +6661,7 @@ msgid "Regex:"
 msgstr "Reg. izraz:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Preizkusi"
 
@@ -7189,21 +7248,21 @@ msgstr "Napaka"
 msgid "Error communicating with device"
 msgstr "Napaka pri komuniciranju z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Ni ustreznih zapisov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Napaka pri komuniciranju z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7211,77 +7270,77 @@ msgstr ""
 "Prišlo je do začasne napake pri komuniciranju z napravo. Ponovno zaženite "
 "ali izklopite in ponovno vklopite napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Naprava: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " zaznana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i/%i knjig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0/%i knjig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Ni naprav"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Ni kartic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Pošiljanje katalogov na napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Pošiljanje novic na napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Pošiljanje knjig na napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Na napravi ni več prostora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7568,7 +7627,7 @@ msgstr "Izberite vrsto zapisa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Zapis"
 
@@ -7704,7 +7763,7 @@ msgstr "V &redu"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "Pre&kliči"
 
@@ -7751,8 +7810,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7784,12 +7843,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Neveljavno ime avtorja"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7974,22 +8033,22 @@ msgid "Working"
 msgstr "V delu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9477,12 +9536,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9551,7 +9610,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Preizkusi"
 
@@ -9786,61 +9845,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Novice:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-knjiga:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9854,67 +9913,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "R&egularni izraz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Ime datoteke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Naslov:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Ni zadetkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Avtorji:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Zbirka:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Indeks v zbirki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regularni izraz (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10122,48 +10199,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Uredi predlogo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Na napravi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Knjiga %s od %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "V knjižnici"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Velikost"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Knjiga <font face=\"serif\">%s</font> od %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Označeno za brisanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dvoklikni me, da me <b>urediš</b><br><br>"
 
@@ -10238,7 +10315,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Ni zadetkov</b> za iskalni niz <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Ni zadetkov"
 
@@ -10255,12 +10332,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Orodna vrstica pregledovalnika LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Naslednja stran"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Prejšnja stran"
 
@@ -11068,25 +11145,32 @@ msgstr "Naj bo &privzeto"
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "E-pošta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -11098,91 +11182,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Srednje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Majhno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Veliko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Vedno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nikoli"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Onemogočeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11191,22 +11275,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11216,64 +11300,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "Oro&dna vrstica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Velikost &ikone:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Pisava vmesnika:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Uveljavi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "O&bnovi privzeto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Shrani spremembe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -12004,30 +12084,34 @@ msgid "The main toolbar"
 msgstr "Glavna orodna vrstica"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Glavna orodna vrstica, ko je povezana naprava"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Kontekstni meni knjig v knjižnici calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Kontekstni meni knjig na napravi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Ni mogoče dodati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Ni mogoče odstraniti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12124,7 +12208,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Najdi"
@@ -12217,166 +12301,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Preimenuj %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr "Dodaj %s v uporabniško kategorijo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr "Odstrani %s iz kategorije %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Išči %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr "Dodaj podkategorijo v %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr "Izbriši uporabniško kategorijo %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Skrij kategorijo %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Pokaži kategorijo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Pokaži vse kategorije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Iskanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr "Preimenuj uporabniško kategorijo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr "Ime %s je že v uporabi!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr "Nova kategorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr "Izbriši uporabniško kategorijo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr "%s ni uporabniška kategorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr "Odstrani kategorijo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr "Dodaj v uporabniško kategorijo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Poišči element v brskalniku značk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12386,60 +12470,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "&Najdi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Strni vse kategorije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Razvrsti po imenu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Razvrsti po priljubljenosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Razvrsti po povprečni oceni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "ujemanje vseh pogojev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "ujemanje poljubnih pogojev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Upravljaj z &uporabniškimi kategorijami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12512,34 +12596,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Napaka pri pretvorbi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Ni uspelo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Aktivna opravila"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12741,7 +12825,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Možnosti za prilagajanje bralnika e-knjig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Zapomni si nazadnje uporabljeno velikost okna"
 
@@ -12819,36 +12903,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Poišči v slovarju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Pojdi na ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Začetek dokumenta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Konec dokumenta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12924,73 +13008,73 @@ msgstr "Predogled tiskanja"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Izberite e-knjigo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "E-knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Zaznamek #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Dodaj zaznamek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Vnesite naslov za zaznamek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Upravljaj z zaznamki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Nalaganje e-knjige ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "E-knjige ni mogoče odpreti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13065,27 +13149,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Natisni e-knjigo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Zamenjaj velikost črk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Pokaži"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Skrij"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Preklopi"
 
@@ -14311,11 +14395,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14329,16 +14413,16 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Selitev stare zbirke podatkov v knjižnico e-knjig v %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopiranje <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Strnjevanje zbirke podatkov"
 
@@ -15378,101 +15462,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Neznan vir novic"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Prenos končan"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "Prenos naslednjih člankov ni uspel:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "Prenos nekaterih delov naslednjih člankov ni uspel:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " z "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tNeuspešne povezave:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Pridobivanje virov ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Dobljeni viri iz glavne strani"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Poskus prenosa naslovnice ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Pričetek prenosa [%d nit(i)] ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Viri, preneseni v %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Prenos naslovnice ni uspel: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Prenašanje naslovnice iz %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Neimenovan članek"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Članek prenesen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Prenos članka ni uspel: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Pridobivanje vira"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16020,9 +16104,6 @@ msgstr "Ne prenesi slogovnih predlog CSS."
 #~ msgid "Use &Roman numerals for series number"
 #~ msgstr "Uporabi &rimska števila za številke serij"
 
-#~ msgid "Toolbar"
-#~ msgstr "Orodna vrstica"
-
 #~ msgid "&Button size in toolbar"
 #~ msgstr "Velikost gum&ba orodne vrstice"
 
@@ -16645,6 +16726,18 @@ msgstr "Ne prenesi slogovnih predlog CSS."
 #~ msgid "Download covers from librarything.com"
 #~ msgstr "Prenesi naslovnice z librarything.com"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Prilagodite orodno vrstico"
+
+#~ msgid "Customize searching"
+#~ msgstr "Prilagodite iskanje"
+
+#~ msgid "No valid plugin found in "
+#~ msgstr "Ni veljavnih vtičnikov v "
+
+#~ msgid "Skip 'Connect to iTunes' recommendation"
+#~ msgstr "Preskoči predlog 'Poveži z iTunes'"
+
 #~ msgid "ascii/LaTeX"
 #~ msgstr "ascii/LaTeX"
 
diff --git a/src/calibre/translations/sq.po b/src/calibre/translations/sq.po
index a82873fd28..2d593d752e 100644
--- a/src/calibre/translations/sq.po
+++ b/src/calibre/translations/sq.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-09-03 18: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: 2011-03-27 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:40+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Personalizojeni"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -325,8 +325,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr ""
+msgid "Toolbar"
+msgstr "Panel"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Lajme"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr "Përshtatje Ekstra"
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Merr të dhëna paisjeje..."
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Titull"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autor(ë)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Botues"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Komente"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Seri"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Gjuhë"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Vulë kohore"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Botuar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Të drejta"
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Dërgoje te pajisja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Bjer lajme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Shteg"
 
@@ -5053,17 +5081,17 @@ msgstr "Shteg"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Asnjë"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr "Gabim"
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Pajisje: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Pa pajisje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr "Zgjidhni Format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Lajme:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-libër:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Titull:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autorë:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Nuk u gjetën përputhje"
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Faqja Pasuese"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Faqja e Mëparshme"
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15246,9 +15303,6 @@ msgstr ""
 #~ msgid "Invalid size"
 #~ msgstr "Madhësi e pavlefshme"
 
-#~ msgid "Toolbar"
-#~ msgstr "Panel"
-
 #~ msgid "Every "
 #~ msgstr "Çdo "
 
diff --git a/src/calibre/translations/sr.po b/src/calibre/translations/sr.po
index 1ba4ca131d..28ff23cfd6 100644
--- a/src/calibre/translations/sr.po
+++ b/src/calibre/translations/sr.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-01-25 08:58+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: 2011-03-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:49+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Ne radi baš ništa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Ne radi baš ništa"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Ne radi baš ništa"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Osnova"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Podesi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Ne mogu da podesim"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Vrsta fajla"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Čitač metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Pisač metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Generator kataloga"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Akcije korisničkog interfejsa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Podešavanja"
@@ -333,8 +333,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Dodajte/uklonite sopstvene kolone za calibre spisak knjiga"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Prilagodite traku sa alatima"
+msgid "Toolbar"
+msgstr "Traka sa alatkama"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -345,7 +345,7 @@ msgstr ""
 "koje su na raspolaganju u svakom od njih"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -676,35 +676,31 @@ msgstr "Ovaj profil je namenjen B&N Nook Color čitaču."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Ovaj profil je namenjen Sanda Bambook čitaču."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Instalirani dodaci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Mapiranje dodataka za različite vrste datoteka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Podešavanja lokalnih podataka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Isključeni dodaci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Uključeni dodaci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Ispravan dodatak nije pronađen u "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Pokretanje dodatka %s nije uspelo. Poruka o grešci je:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -716,15 +712,15 @@ msgstr ""
 "    Podesi calibre učitavanjem spoljnih dodataka.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Instalirajte dodatak navođenjem putanje ka ZIP fajlu koji ga sadrži."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Uklonite dodatak po imenu. Ovo nema uticaja na ugrađene dodatke."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -732,15 +728,15 @@ msgstr ""
 "Podesite dodatak. Navedite ime dodatka i naredbu za podešavanje rastavljene "
 "zarezom."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Prikaži sve instalirane dodatke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Uključi navedeni dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Isključi navedeni dodatak"
 
@@ -764,43 +760,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Uspostavi vezu sa S60 telefonima."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Koristi seriju kao kategoriju u iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Zapamti omote iz iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Uspastavi vezu sa iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Pronađen je Apple uređaj. Pokrećem iTunes. Molim sačekajte..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -808,27 +816,27 @@ msgstr ""
 "Ne mogu da kopiram knjige direktno s iUređaja. Prevucite ih iz iTunesa na "
 "desktop, a odatle u prozor calibre biblioteke."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Ažuriranje spiska metapodataka na uređaju..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d od %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "završeno"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -838,7 +846,7 @@ msgstr ""
 "Izbrišite ih koristeći iBooks program.\n"
 "Kliknite na 'Prikaži detalje' za spisak."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -846,31 +854,31 @@ msgstr ""
 "Neki omoti nisu mogli da budu konvertovani.\n"
 "Kliknite na 'Prikaži detalje' za spisak."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Vesti"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Uspostavi vezu sa iTunes."
 
@@ -921,20 +929,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Preuzimam spisak knjiga sa uređaja..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Šaljem knjige na uređaj..."
 
@@ -942,8 +950,8 @@ msgstr "Šaljem knjige na uređaj..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Dodajem knjige na spisak metapodataka na uređaju..."
 
@@ -953,8 +961,8 @@ msgstr "Dodajem knjige na spisak metapodataka na uređaju..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Uklanjam knjige sa uređaja..."
 
@@ -962,17 +970,17 @@ msgstr "Uklanjam knjige sa uređaja..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Uklanjam knjiga sa spiska metapodataka na uređaju..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Šaljem metapodatke na uređaj..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK nije instalirana."
 
@@ -1277,15 +1285,15 @@ msgstr "Uspostavi vezu sa Sony PRS-500 čitačem."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Uspostavi vezu sa svim Sony čitačima."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Sve, po naslovu"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Sve, po autoru"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1293,7 +1301,7 @@ msgstr ""
 "Zarezima razdvojen spisak polja za metapodatke koji će biti pretvoreni u "
 "kolekcije na uređaju. Mogućnosti uključuju: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1303,11 +1311,11 @@ msgstr ""
 "uključili dodajte ove vrednosti u listu. Kolekcijama će biti dodeljeno ime "
 "posle znaka \":\"."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Prenesi odvojene ikone omota za knjige (noviji čitači)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1320,14 +1328,14 @@ msgstr ""
 "DRMom kojima ne možete da promenite omot. UPOZORENJE: Ovu opciju treba "
 "koristiti samo s novijim SONY čitačima: 350, 650, 950 i novijim."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Osvežite zasebne omote kada je u upotrebi automatsko upravljanje (noviji "
 "čitači)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1337,17 +1345,28 @@ msgstr ""
 "kada je uređaj priključen. Onemogućite je ako imate toliko knjiga da ova "
 "aktivnosti uzima previše vremena."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1485,7 +1504,7 @@ msgstr "Dodatna podešavanja"
 msgid "Communicate with an eBook reader."
 msgstr "uspostavi vezu s čitačem e-knjiga."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Preuzmi podatke o uređaju..."
 
@@ -2293,7 +2312,7 @@ msgstr "Konvertujem ulaz u HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Izvodim transformacije na e-knjizi..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Kreiram"
 
@@ -2450,7 +2469,7 @@ msgstr "Počni"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Nemoj da dodaš Sadržaj na početak knjige."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2468,6 +2487,10 @@ msgstr ""
 "podešavanja za \"Otkrivanje strukture\" i/ili \"Sadržaj\" (uključite "
 "\"Nametni korišćenje automatski generisanog Sadržaja\")."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2866,105 +2889,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "GREŠKA U ŠABLONU"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Ne"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Da"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Naslov"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Autori"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Izdavač"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Komentari"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etikete"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Serija"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Jezik"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Vremenska oznaka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Objavljeno"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Prava"
 
@@ -3402,7 +3425,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3542,7 +3565,7 @@ msgid "HTML TOC generation options."
 msgstr "Opcije za generisanje HTML Sadržaja"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3747,6 +3770,7 @@ msgid "Author"
 msgstr "Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Naslov"
 
@@ -4059,136 +4083,140 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "Pošalji fajl na memorijsku karticu umesto u glavnu memoriju uređaja."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Traži potvrdu pre brisanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Veličina glavnog prozora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Obavesti me kada je na raspolaganju nova verzija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Koristi rimske cifre za broj serije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Sortiraj spisak etiketa po nazivu, popularnosti, ili oceni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Broj naslovnih strana koje će biti prikazane u izlogu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Podrazumevane opcije za konverziju u LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Opcije za LRF čitač"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Formati koje je moguće čitati ugrađenim čitačem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Kolone koje će biti prikazane u spisku knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Pri pokretanju programa automatski pokreni server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Najstarije vesti koje će se čuvati u bazi podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Prikaži sistemsku ikonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Prenesi preuzete vesti na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Po prenošenju na uređaj izbriši knjige iz biblioteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 "Prikaži izlog naslovnih strana u odvojenom, umesto u osnovnom calibre prozoru"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Onemogući poruke iz sistemske ikone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "Podrazumevana akcija kada se pritisne dugme za prenos na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maksimalni broj radnih procesa u redu za čekanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Preuzmi društvene metapodatke (etikete/ocene/itd)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Prepiši ime autora i naslov novim metapodacima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Automatski preuzmi omot, ako je na raspolaganju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Ograniči najveći broj poslova na broj procesora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Izgled korisničkog interfejsa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Prikaži srednju ocenu po stavki u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Onemogući animacije u korisničkom interfejsu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "kategorije koje ne treba prikazati u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Izaberi fajlove"
 
@@ -4401,8 +4429,8 @@ msgstr "Koristite samo beleške iz glavne biblioteke"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Nije izabrana nijedna knjiga"
@@ -4604,7 +4632,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4674,7 +4702,7 @@ msgid "Bulk convert"
 msgstr "Konvertuj masovno"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Ne mogu da konvertujem"
 
@@ -4682,7 +4710,7 @@ msgstr "Ne mogu da konvertujem"
 msgid "Starting conversion of %d book(s)"
 msgstr "Počinjem konverziju %d knjiga."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "Prazan izlazni fajl - proces konverzije verovatno nije uspeo"
 
@@ -4873,7 +4901,7 @@ msgid "Stop Content Server"
 msgstr "Zaustavi server sadržaja"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Pošalji elektronskom poštom na"
 
@@ -4881,32 +4909,32 @@ msgstr "Pošalji elektronskom poštom na"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Podesi razmenu knjiga elektronskom poštom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Pošalji na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Poveži/razmeni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4993,20 +5021,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Preuzimam {0} od {1} knjiga"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Ne mogu da promenim metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Ne mogu da spojim knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5014,7 +5042,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5026,7 +5054,7 @@ msgstr ""
 "ostale knjige neće biti izbrisane, ili izmenjene.<br><br> Molim potvrdite da "
 "ćelite da nastavite."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5046,7 +5074,7 @@ msgstr ""
 "iz vaše calibre biblioteke.<br><br>Da li ste <b>sigurni</b> da želite da "
 "nastavite?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5063,19 +5091,19 @@ msgstr ""
 "ostalim knjigama zauvek <b>obrisani</b> iz vaše calibre "
 "biblioteke.<br><br>Da li ste <b>sigurni</b> da želite da nastavite?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Preuzmi vesti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Preuzimam vesti sa "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " preuzeto."
 
@@ -5140,7 +5168,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Pokrenite čarobnjaka za dobrodošlicu"
 
@@ -5393,7 +5421,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:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nema knjiga"
 
@@ -5612,8 +5640,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Putanja"
 
@@ -5623,17 +5651,17 @@ msgstr "Putanja"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Formati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Kolekcije"
 
@@ -5643,25 +5671,25 @@ msgid "Click to open"
 msgstr "Kliknite da biste otvorili"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Nema"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5719,7 +5747,7 @@ msgstr "izlaz"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5742,14 +5770,14 @@ msgstr "izlaz"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6335,10 +6363,14 @@ msgstr "Ne stavljaj &Sadržaj na početak knjige."
 msgid "FB2 Output"
 msgstr "FB2 izlaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Podeli na sekcije:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Čarobnjak za promenu veličine slova"
@@ -6953,7 +6985,7 @@ msgid "Regex:"
 msgstr "Regularni izraz:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Probaj"
 
@@ -7556,21 +7588,21 @@ msgstr "Greška"
 msgid "Error communicating with device"
 msgstr "Greška u komunikaciji sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Nema odgovarajućih formata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 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:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Greška u komunikaciji sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7578,67 +7610,67 @@ 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Uređaj: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " detektovan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /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:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Izaberi format za slanje na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Nema uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 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:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Nema memorijske kartice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Šaljem katalog na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Šaljem vesti na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Šaljem knjige na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7647,11 +7679,11 @@ msgstr ""
 "odgovarajući formati. Morate prvo konvertovati knjige u format koji vaš "
 "uređaj podržava."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Na uređaju nema dovoljno mesta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7953,7 +7985,7 @@ msgstr "Izaberite format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -8093,7 +8125,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Odustani"
 
@@ -8142,8 +8174,8 @@ msgid "Location"
 msgstr "Lokacija"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8175,12 +8207,12 @@ msgid "Author sort"
 msgstr "Sortiranje po autoru"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Neispravno ime autora"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Imena autora ne mogu sadržati znak &."
 
@@ -8372,22 +8404,22 @@ msgid "Working"
 msgstr "Radim"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Mala slova"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Velika slova"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Veličina slova za naslov"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Veliko prvo slovo"
 
@@ -9977,12 +10009,12 @@ msgid "%s (was %s)"
 msgstr "%s (bilo %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Ova stavka je prazna"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "Stavka ne može da bude prazna. Izbrišite je."
 
@@ -10053,7 +10085,7 @@ msgid "Send test mail from %s to:"
 msgstr "Pošalji probnu poruku od %s za:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Proba"
 
@@ -10307,62 +10339,62 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "Pošalji %s na %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Vesti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Priključen je magazin %s koji je calibre preuzeo za vas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-knjiga:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 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/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "u formatu %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Šaljem poruku za"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 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/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Nisam uspeo da pošaljem knjigu elektronskom poštom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "poslato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Poslao vesti za"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10376,67 +10408,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Regularni &izraz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "&Ime fajla:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Naslov:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Regularni izraz (?P&lt;naslov&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Ništa nije pronađeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Autor:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Regularni izraz(?P<autor>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Serija:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Regularni izraz (?P<serija>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Broj u seriji:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Regularni izraz (?P<broj_u_seriji>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Regularni izraz (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Izlog omota"
@@ -10647,48 +10697,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "Uredi šablon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "Na uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Veličina (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Knjiga %s od %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Ime za pretragu je \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "UUID ove knjige je \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "U biblioteci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Veličina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Izabrano za brisanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Kliknite dva puta da me <b>promenite</b><br><br>"
 
@@ -10766,7 +10816,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Ništa nije pronađeno</b> za upit <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Ništa nije pronađeno"
 
@@ -10783,12 +10833,12 @@ msgid "LRF Viewer toolbar"
 msgstr "Traka sa alatkama za LRF čitač"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Sledeća strana"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Prethodna strana"
 
@@ -11641,20 +11691,27 @@ msgstr "Učini &podrazumevanom vrednošću"
 msgid "&Remove email"
 msgstr "&Ukloni elektronsku adresu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Automatsko slanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Elektronska pošta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 "Formati za slanje elektronskom poštom. Biće poslat prvi pronađeni format."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11662,7 +11719,7 @@ msgstr ""
 "Ako je opcija izabrana, preuzete vesti će biti poslate automatski <br>na ovu "
 "elektronsku adresu (pod uslovom da je u jednom od navedenih formata)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "nova elektronska adresa"
 
@@ -11674,96 +11731,96 @@ msgstr "Uzak"
 msgid "Wide"
 msgstr "Širok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Srednja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Mala"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Velika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Uvek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatsko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Nikada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Po prvom slovu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Isključeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Podeljeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Izg&led korisničkog interfejsa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Izaberi &jezik (zahteva ponovno pokretanje programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Prik&aži srednje ocene u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 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/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Onemogući &animacije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 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/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Prikaži &početni ekran pri pokretanju programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Isključi &poruke iz sistemske kasete"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Koristi &rimske brojeve za serije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 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/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11777,11 +11834,11 @@ msgstr ""
 "vidite grupe podjednake veličine. Postavite na 'isključeno'\n"
 "ako vam podkategorije nikada nisu potrebne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -11790,11 +11847,11 @@ msgstr ""
 "Ako kategorija za Izlog etiketa ima više od ovog broja, biće podeljena\n"
 "na podkategorije. Ako je način deljenja isključen ova vrednost se ignoriše."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11804,52 +11861,48 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Traka sa alatima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "Veličina &ikona:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Prikaži &tekst ispod ikona:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "Podeli traku &sa alatima na dve"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Vrsta slova za korisnički interfejs:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Promeni vrstu &slova (potrebno je ponovno pokretanje)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Primeni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Vrati po&drazumevane vrednosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Sačuvaj izmene"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Odustani i vrati se na pregled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Vraćanje na podrazumevane vrednosti nije podržano za"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -11857,7 +11910,7 @@ msgstr ""
 "Neke od izmena koje ste napravili zahtevaju ponovo pokretanje programa. "
 "Molim vas da što pre ponovo pokrenete calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -11865,7 +11918,7 @@ msgstr ""
 "Izmene koje ste uneli zahtevaju da odmah ponovo pokrenete calibre. Dok to ne "
 "uradite neće biti moguće menjati ostala podešavanja."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Potrebno je ponovno pokretanje"
@@ -12664,30 +12717,34 @@ msgid "The main toolbar"
 msgstr "Glavna traka sa alatima"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Glavna traka sa alatima kada je uređaj priključen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Kontektskno osetljiv meni za knjige u calibre biblioteci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Kontektskno osetljiv meni za knjige na uerđaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Ne mogu da dodam"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Ne mogu da dodam akcije %s na ovo mesto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Ne mogu da uklonim"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Ne mogu da uklonim akcije %s sa ovog mesta"
 
@@ -12787,7 +12844,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Traži"
@@ -12880,167 +12937,167 @@ msgstr "Klikni da promeniš"
 msgid "&Alternate shortcut:"
 msgstr "&Alternativna prečica:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Sakrij kategoriju %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Prikaži kategoriju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Uredi '%s'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Uredi sačuvane pretrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Uredi korisničke kategorije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Prikaži sve kategorije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Promeni naćin kreiranja podkategorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr "Promena autora za više knjiga može potrajati. Da li ste sigurni?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 "Izmena metapodataka za ovoliko knjiga može potrajati. Da li ste sigurni?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Pretrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Naziv pretrage već postoji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "Naziv sačuvane pretrage %s je već u upotrebi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Pronađi stavku u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13058,63 +13115,63 @@ msgstr ""
 "stavke\n"
 "koje sadrže tekst \"foo\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "Traž&i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Pronađi prvu/sledeću stavku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Zatvori sve kategorije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "Nema više rezultata pretrage.</b><p> Kliknite na \"Traži ponovo\" da biste "
 "skočili na prvi rezultat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Sortiraj po imenu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Sortiraj po popularnosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Sortiraj po srednjoj oceni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 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:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Moraju odgovarati svi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Odgovara bilo koji od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "&Uredi korisničke kategorije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Dodajte sopstvene kategorije u Izlog etiketa"
 
@@ -13194,24 +13251,24 @@ msgstr ""
 "izveštaj o radu će biti u fajlu: %s<p>Sadržaj ovog fajlaće biti prikazan "
 "automatski."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Recept je isključen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Neuspelo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13222,11 +13279,11 @@ msgstr ""
 "uređaju.<br>\n"
 "                      Da li ste sigurni da želite da prekinete rad?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13433,7 +13490,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Opcije za podešavanje čitača e-knjiga"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Zapamti poslednje korišćenu veličinu prozora"
 
@@ -13515,36 +13572,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Pronađi u rečniku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Idi na..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Sledeći odeljak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Prethodni odeljak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Početak dokumenta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Kraj dokumenta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Početak odeljka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Kraj odeljka"
 
@@ -13622,76 +13679,76 @@ msgstr "Pregled pred štampanje"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Poveži se sa dict.org da pronađeš: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Izaberi e-knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "E-knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Nije pronađeno ništa za: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Učitavam izlog..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Predstavljam %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Oznaka #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Dodaj oznaku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Unesi naziv za oznaku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Uredi oznake"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Učitavam e-knjigu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Nisam uspeo da otvorim e-knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Opcije za kontrolu čitača e-knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Ako je naveden, prozor čitača će pokušati da pri pokretanju dođe u prvi plan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Ako je navedeno, prozor za čitanje će se pri pokretanju otvoriti preko celog "
 "ekrana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Prikaži javascript upozorenja i poruke na konzoli"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13769,27 +13826,27 @@ msgstr "Pronađi prethodno pojavljivanje"
 msgid "Print eBook"
 msgstr "Štampaj e-knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Promeni veličinu slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Zameni velika slova u mala, i obrnuto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Povuci za promenu veličine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Prikaži"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Sakrij"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Prebaci"
 
@@ -15232,11 +15289,11 @@ msgstr ""
 "\n"
 "Za pomoć vidite: %%prog komanda --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Nije navedena nijedna etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15252,16 +15309,16 @@ msgstr "%sSrednja ocena je %3.1f"
 msgid "Main"
 msgstr "Osnovna"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Prevodim staru bazu podataka u biblioteku e-knjiga u %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopiram <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Sažimam bazu podataka"
 
@@ -16362,95 +16419,95 @@ msgstr "Ne preuzimaj najnoviju verziju ugrađenih recepata sa calibre servera"
 msgid "Unknown News Source"
 msgstr "Nepoznat izvor vesti"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Preuzimanje gotovo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " sa "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tNeuspele veze:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Preuzimam izvore..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Dobio sam izvore s osnovne strane..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Pokušavam da preuzmem naslovnu stranu..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Generišem impresum..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "Počinjem preuzimanje [%d niti]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Izvori su preuzeti u %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Nisam uspeo da preuzmem naslovnu stranu: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Preuzimam naslovnu stranu sa %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Preuzeo sam sliku za impresum"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Članak bez imena"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Preuzeo sam članak: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Nije uspelo preuzimanje članka: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Preuzimam izvor"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -16458,7 +16515,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16827,9 +16884,6 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ msgid "Use &Roman numerals for series number"
 #~ msgstr "Koristi &rimske cifre za broj serije"
 
-#~ msgid "Toolbar"
-#~ msgstr "Traka sa alatkama"
-
 #~ msgid "Select visible &columns in library view"
 #~ msgstr "Izaberi vidljive &kolone u prikazu biblioteke"
 
@@ -18117,6 +18171,9 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ msgid "Tags to apply when adding a book:"
 #~ msgstr "Etikete koje će biti dodate knjizi:"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Prilagodite traku sa alatima"
+
 #~ msgid "Read metadata from &file contents rather than file name"
 #~ msgstr "Čitaj metapodatke iz sadržaja, a ne imena &fajla"
 
@@ -18219,6 +18276,9 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ msgid "Test re&sult"
 #~ msgstr "Test re&zultat"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "Podeli traku &sa alatima na dve"
+
 #~ msgid ""
 #~ "Explode the ePub to display contents in a file browser window. To tweak "
 #~ "individual files, right-click, then 'Open with...' your editor of choice. "
@@ -18459,6 +18519,9 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ "<b>obrisani</b> s vašeg računara.<br><br> Da li ste <b>sigurni</b> da želite "
 #~ "da nastavite?"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Ispravan dodatak nije pronađen u "
+
 #~ msgid "Communicate with the Booq Avant"
 #~ msgstr "Uspostavi vezu s Booq Avant čitačem."
 
diff --git a/src/calibre/translations/sv.po b/src/calibre/translations/sv.po
index feac1f7c67..d12cf5772d 100644
--- a/src/calibre/translations/sv.po
+++ b/src/calibre/translations/sv.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2011-03-11 21:15+0000\n"
-"Last-Translator: Merarom <Unknown>\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-06 15:13+0000\n"
+"Last-Translator: Daniel Nylander <yeager@ubuntu.com>\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: 2011-03-27 04:48+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-07 04:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 "X-Poedit-Country: SWEDEN\n"
 "X-Poedit-Language: Swedish\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Gör absolut ingenting"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -34,7 +34,7 @@ msgstr "Gör absolut ingenting"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -51,9 +51,9 @@ msgstr "Gör absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -73,7 +73,7 @@ msgstr "Gör absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -119,19 +119,19 @@ msgstr "Gör absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -139,12 +139,12 @@ msgstr "Gör absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -155,11 +155,11 @@ msgstr "Gör absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -173,46 +173,46 @@ msgstr "Gör absolut ingenting"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Bas"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Anpassa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Kan inte konfigurera"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Filtyp"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadata läsare"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadata författare"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Kataloggenerator"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Användargränssnittsåtgärd"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Inställningar"
@@ -340,8 +340,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Lägga till / ta bort dina egna kolumner till Calibres boklista"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Anpassa verktygsfältet"
+msgid "Toolbar"
+msgstr "Verktygsrad"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -352,8 +352,8 @@ msgstr ""
 "varje"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "Anpassa sökning"
+msgid "Searching"
+msgstr "Sökning"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -683,35 +683,31 @@ msgstr "Denna profil är avsedd för B&N Nook Color."
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Denna profil är avsedd för Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Installerade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Kopplingar mellan tillägg och filändelser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Anpassa tillägg lokalt"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Inaktiverade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Aktiverade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Inget giltigt tillägg hittades i "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -723,18 +719,18 @@ msgstr ""
 "    Anpassa calibre genom att ladda externa tillägg.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -742,15 +738,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:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Lista alla installerade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Aktivera namngivet tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Inaktivera namngivet tillägg"
 
@@ -774,43 +770,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Kommunicera med S60-telefoner"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr "Inaktivera Apple-drivrutin"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr "Aktivera Apple-drivrutin"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Använd serie som kategori i iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Spara omslag från iTunes/iBooks i cachen"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple-enhet"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Kommunicera med iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "pple-enhet identifieras, starta iTunes, var god vänta ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -818,27 +826,27 @@ msgstr ""
 "Kan inte kopiera böcker direkt från iDevice. Dra från iTunes-biblioteket "
 "till skrivbordet, sedan lägg till Calibres biblioteksfönster."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Uppdaterar metadata på enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d av %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "slutförda"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -848,7 +856,7 @@ msgstr ""
 "Ta bort med hjälp av iBook app.\n"
 "Klicka på \"Visa detaljer\" för en lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -856,31 +864,31 @@ msgstr ""
 "En del omslag kan inte konverteras.\n"
 "Klicka på \"Visa detaljer\" för en lista."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Nyheter"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Kommunicera med iTunes"
 
@@ -931,20 +939,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Hämtar en lista över böcker på enheten..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Överför böcker till enheten..."
 
@@ -952,8 +960,8 @@ msgstr "Överför böcker till enheten..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Lägger till böcker till enhetens metadatalista..."
 
@@ -963,8 +971,8 @@ msgstr "Lägger till böcker till enhetens metadatalista..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Tar bort böcker från enheten..."
 
@@ -972,17 +980,17 @@ msgstr "Tar bort böcker från enheten..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Ta bort böcker från enhetens metadatalista..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Skickar metadata till enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK har inte installerats."
 
@@ -1295,15 +1303,15 @@ msgstr "Kommunicera med läsplattan Sony PRS-500."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Kommunicera med alla Sonys läsplattor."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Alla efter titel"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Alla efter författare"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1311,7 +1319,7 @@ msgstr ""
 "Kommaseparerad lista av metadatafält att förvandla till samlingar på "
 "enheten. Möjliga alternativ är: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
@@ -1321,11 +1329,11 @@ msgstr ""
 "värden till listan för att aktivera dem. Samlingarna kommer att få namn som "
 "anges efter \":\" tecknet."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "Ladda upp ett separat omslagsminiatyrer för böcker (nyare läsare)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1339,13 +1347,13 @@ msgstr ""
 "VARNING: Detta alternativ ska endast användas med nyare SONY läsare: 350, "
 "650, 950 och nyare."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 "Uppdatera separata omslag när du använder automatisk hantering (nyare läsare)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
@@ -1355,11 +1363,11 @@ msgstr ""
 "gång du ansluter din enhet. Avmarkera det här alternativet om du har så "
 "många böcker på läsaren att prestanda är oacceptabel."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "Bevara omslagsbildformat när man bygger miniatyrer"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
@@ -1369,6 +1377,17 @@ msgstr ""
 "proportioner (bredd och höjd) som omslaget. Avmarkera det om du vill att "
 "bilden ska vara den maximala storleken, dvs ignorerar proportioner."
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr "Sök efter böcker i alla mappar"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1505,7 +1524,7 @@ msgstr "Extra anpassning"
 msgid "Communicate with an eBook reader."
 msgstr "Kommunicera med en läsplatta."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Hämta enhetsinformation..."
 
@@ -2331,7 +2350,7 @@ msgstr "Konverterar indata till HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Omformar e-boken..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Skapar"
 
@@ -2487,7 +2506,7 @@ msgstr "Starta"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Infoga ingen innehållsförteckning i början av boken."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2505,6 +2524,10 @@ msgstr ""
 "\"Strukturupptäck\" och / eller \"Innehållsförteckning\" inställningar (slå "
 "på \"Tvinga användning av automatisk genererade innehållsförteckning)."
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr "för en komplett lista med beskrivningar."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2909,105 +2932,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "MALL FEL"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Nej"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Ja"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Författare"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Förlag"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiketter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Språk"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Tidsstämpel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Utgiven"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Rättigheter"
 
@@ -3431,31 +3454,31 @@ msgstr "Laddar ner metadata från Amazon"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:287
 msgid "US"
-msgstr ""
+msgstr "USA"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:288
 msgid "France"
-msgstr ""
+msgstr "Frankrike"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:289
 msgid "Germany"
-msgstr ""
+msgstr "Tyskland"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:290
 msgid "UK"
-msgstr ""
+msgstr "Storbritannien"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:375
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "Metadatakälla"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/openlibrary.py:15
 msgid "Downloads metadata from The Open Library"
-msgstr ""
+msgstr "Hämtar metadata från The Open Library"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
@@ -3588,7 +3611,7 @@ msgid "HTML TOC generation options."
 msgstr "Alternativ för innehållsförteckning från HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3792,6 +3815,7 @@ msgid "Author"
 msgstr "Författare"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Ämne"
 
@@ -4142,73 +4166,77 @@ msgstr ""
 "det paras ihop med en txt-utformatering alternativ som inte är tomma "
 "eftersom länkar alltid bort med vanlig text utgång."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Skicka som standard filen till minneskortet i stället för till det inbyggda "
 "minnet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Bekräfta före borttagning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Huvudfönstrets geometri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Meddela när en ny version finns tillgänglig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Använd romerska siffror för nummer i serien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Sortera etikettlista efter namn, popularitet eller betyg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Antal omslag att visa i omslagsbläddraren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Standardvärden för konvertering till LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Alternativ för LRF-läsaren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Format som visas med den interna läsaren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Antal kolumner som ska visas i boklistan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Starta automatiskt medieservern när programmet startas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "De äldsta nyheter som ska behållas i databasen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Visa en ikon i systemfältet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Skicka hämtade nyheter till enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Ta bort böcker från biblioteket efter att de skickats till enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -4216,15 +4244,15 @@ msgstr ""
 "Visa omslagsbläddraren i ett separat fönster i stället för i Calibres "
 "huvudfönster"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Inaktivera meddelanden från ikonen i systemfältet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "Standardåtgärd som knappen \"skicka till enhet\"  skall utföra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
@@ -4232,7 +4260,7 @@ msgstr ""
 "Börja söka när du skriver. Om detta är inaktiverad sedan söka kommer endast "
 "att ske när Enter eller Retur trycks ned."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
@@ -4241,44 +4269,44 @@ msgstr ""
 "När du söker, Visa alla böcker med sökresultaten markeras istället för att "
 "visa bara träffarna. Du kan använda N eller F3 för att gå till nästa match."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Maximalt antal väntande bearbetningsprocesser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Hämta sociala metadata (etiketter/betyg/m.m.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Skriv över författare och titel med nya metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "Automatiskt hämtning av omslag, om det finns"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Maximalt antal samtidiga jobb till samtliga processorer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Gränssnittets utseende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Visa snittbetyg per objekt i etikettbläddraren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Inaktivera animationer i gränssnittet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "Kategorier som inte skall visas i etikettbläddraren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Välj filer"
 
@@ -4495,8 +4523,8 @@ msgstr "Användaranteckningar genereras endast från huvudbiblioteket"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Inga böcker har valts"
@@ -4701,7 +4729,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4772,7 +4800,7 @@ msgid "Bulk convert"
 msgstr "Masskonvertering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Kan inte konvertera"
 
@@ -4780,7 +4808,7 @@ msgstr "Kan inte konvertera"
 msgid "Starting conversion of %d book(s)"
 msgstr "Påbörjar konvertering av %d böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "Tom utfil, förmodligen kraschade konverteringsprocessen"
 
@@ -4971,7 +4999,7 @@ msgid "Stop Content Server"
 msgstr "Stoppa mediaserver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "E-post till"
 
@@ -4979,32 +5007,32 @@ msgstr "E-post till"
 msgid "Email to and delete from library"
 msgstr "E-post till och ta bort från biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(Ta bort från bibliotek)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Dela ut böcker via e-post..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Skicka till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Anslut/dela ut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "Avslutar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "Stoppa server, kan detta ta upp till en minut, vänta ..."
@@ -5091,20 +5119,20 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "Nedladdning {0} för {1} bok (böcker)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Kan inte redigera metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Kan inte sammanfoga böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 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/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -5112,7 +5140,7 @@ 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -5124,7 +5152,7 @@ msgstr ""
 "Andra och efterföljande böcker som sedan valts kommer inte att tas bort "
 "eller ändras. <br> Bekräfta att du vill fortsätta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -5145,7 +5173,7 @@ msgstr ""
 "borttagna </ b> från ditt Caliber-biblioteket. <br> Är du <b> säker </b> att "
 "du vill fortsätta?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -5163,19 +5191,19 @@ msgstr ""
 "permanent <b> bort </ b> från din kaliber biblioteket. <br> Är du <b> säker "
 "</ b> du vill fortsätta?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Hämta nyheter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Hämtar nyheter från "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " hämtade."
 
@@ -5240,7 +5268,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Kör välkomstguide"
 
@@ -5418,7 +5446,7 @@ msgstr "Visa specifikt format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:38
 msgid "Read a random book"
-msgstr ""
+msgstr "Läs en slumpmässig bok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:181
@@ -5492,7 +5520,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:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Inga böcker"
 
@@ -5711,8 +5739,8 @@ msgstr "Flera böcker per &mapp, antar varje ebokfil är en annorlunda bok"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Sökväg"
 
@@ -5722,17 +5750,17 @@ msgstr "Sökväg"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "Samlingar"
 
@@ -5742,25 +5770,25 @@ msgid "Click to open"
 msgstr "Klicka för att öppna"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "Inget"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "Klistra omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "Kopiera omslag"
 
@@ -5818,7 +5846,7 @@ msgstr "utdata"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5841,14 +5869,14 @@ msgstr "utdata"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -6441,10 +6469,14 @@ msgstr "Infoga ingen innehållsförteckning i början av boken."
 msgid "FB2 Output"
 msgstr "FB2-utdata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "Sektionerad:"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr "Genre"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "Guide för att omskala teckensnitt"
@@ -7071,7 +7103,7 @@ msgid "Regex:"
 msgstr "Reguljärt uttryck:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -7683,21 +7715,21 @@ msgstr "Fel"
 msgid "Error communicating with device"
 msgstr "Fel vid kommunikation med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Inga lämpliga format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 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:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Kunde inte kommunicera med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7705,68 +7737,68 @@ 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Enhet: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " hittades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /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:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i av %i böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 av %i böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Välj format att skicka till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Ingen enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Kan inte skicka: ingen enhet är ansluten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Inget kort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 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:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 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:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Skickar kataloger till enhet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Skickar nyheter till enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Skickar böcker till enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7775,11 +7807,11 @@ msgstr ""
 "format hittades. Konvertera boken/böckerna till ett format som stöds av "
 "enheten först."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Inget ledigt utrymme på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -8084,7 +8116,7 @@ msgstr "Välj format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Format"
 
@@ -8227,7 +8259,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "&Avbryt"
 
@@ -8276,8 +8308,8 @@ msgid "Location"
 msgstr "Plats"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -8315,12 +8347,12 @@ msgid "Author sort"
 msgstr "Författarsortering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Ogiltigt författarnamn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Författarnamnet kan inte innehålla & tecken."
 
@@ -8520,22 +8552,22 @@ msgid "Working"
 msgstr "Arbetar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Gemener"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Versaler"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Varje Ord Med Stor Begynnelsebokstav"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "Inledande stor bokstav"
 
@@ -10176,12 +10208,12 @@ msgid "%s (was %s)"
 msgstr "%s (var %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "Posten är tom"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "En post kan inte lämnas tom. Ta bort den i stället."
 
@@ -10252,7 +10284,7 @@ msgid "Send test mail from %s to:"
 msgstr "Skicka testpost från %s till:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Testa"
 
@@ -10506,62 +10538,62 @@ msgstr "Hämtningen misslyckades"
 msgid "Failed to download from %r with error: %s"
 msgstr "Misslyckades att ladda ner från %r med fel: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "E %s till %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Nyheter:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "Bifogat är %s periodiskt hämtade av Caliber."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "E-bok:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "Bifogat, kommer du hitta e-boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "av"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "i %s-formatet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Skickar e-post till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 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/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 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/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "Det gick inte att e-posta boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "skickas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Skickat nyheter till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -10584,67 +10616,85 @@ msgstr ""
 "Gruppen namnen för de olika posternas metadata finns dokumenterade i "
 "verktygstips. </p> </div>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "Reguljärt &uttryck"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "Fil&namn:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Titel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "Reguljärt uttryck (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Ingen träff"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Författare:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "Reguljärt uttryck (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "Serie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "Reguljärt uttryck (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "Ordningsnummer i serien:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "Reguljärt uttryck (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "Reguljärt uttryck (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr "Utgivare:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr "Reguljärt uttryck (?P<publisher>)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr "Publicerad:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr "Reguljärt uttryck (?P<published>)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Omslagsbläddrare"
@@ -10856,48 +10906,48 @@ msgstr "J"
 msgid "Edit template"
 msgstr "Redigera mall"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "På enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "MiB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "Boka %s av %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "Söknamn är \"(0)\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "Denna boks UUID är \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "Storlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "Markerat för borttagning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dubbelklicka för att <b>redigera</b> mig<br><br>"
 
@@ -10974,7 +11024,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Inga träffar</b> för sökfrasen <i>%s</i> hittades."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "Inga träffar hittades"
 
@@ -10991,12 +11041,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF-visarens verktygsrad"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "Nästa sida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "Föregående sida"
 
@@ -11422,7 +11472,7 @@ msgstr "Hög"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:36
 msgid "Very low"
-msgstr ""
+msgstr "Mycket lågt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:164
 msgid "Confirmation dialogs have all been reset"
@@ -11617,7 +11667,7 @@ msgstr "Ändrat datum"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 msgid "People's names"
-msgstr ""
+msgstr "Personers namn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 msgid "Number"
@@ -11658,7 +11708,7 @@ msgstr "Mitt betyg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:150
 msgid "People"
-msgstr ""
+msgstr "Personer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:179
 msgid "No lookup name was provided"
@@ -11761,7 +11811,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:201
 msgid "Contains names"
-msgstr ""
+msgstr "Innehåller namn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:202
 msgid ""
@@ -11883,19 +11933,26 @@ msgstr "Ange som grundinställning"
 msgid "&Remove email"
 msgstr "Ta bort e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "Sänd automatiskt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "E-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "Format för e-post. Första matchande format kommer att skickas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
@@ -11903,7 +11960,7 @@ msgstr ""
 "Om markerat, kommer hämtade nyheter att skickas automatiskt <br>till denna e-"
 "postadress (förutsatt att de finns i ett av de listade formaten)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "ny e-postadress"
 
@@ -11915,92 +11972,92 @@ msgstr "Smal"
 msgid "Wide"
 msgstr "Bred"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "Medel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Liten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Stor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Alltid"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Aldrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "Efter första bokstaven"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "Partitionerad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "Vy (omstart krävs)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 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/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Välj språk (kräver omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Visa medelbetyg i etikettbläddraren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 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/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "Inaktivera animationer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Visa ikon i systemfältet (kräver omstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "Visa uppstartsfönster"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "Inaktivera &meddelanden i systemlistan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "Använd och romerska siffror för serier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 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/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr "Markerar webbläsare kategori &partitioneringsmetoden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -12014,11 +12071,11 @@ msgstr ""
 "har en lista med fast storlek grupper. Välj inställning inaktiverad.\n"
 "Om du vill aldrig underkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr "&Komprimera när fler objekt än:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -12029,11 +12086,11 @@ msgstr ""
 "i underkategorier. Om partitioneringsmetoden är inställt på inaktivera, "
 "ignoreras detta värde."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr "Kategorier med  hierarkiska objekt:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -12050,52 +12107,48 @@ msgstr ""
 "både under \"Mystery\". Om \"märkning\" är inte i detta fält,\n"
 "då markeringar kommer att visas på egna linje."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "&Verktygsfält"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "&Ikonstorlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "Visa text under ikoner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "&Dela verktygsfältet i två verktygsfält"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "Gränssnitts teckensnitt:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "Förändring &teckensnitt (kräver omstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Verkställ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "Återställ  &standardvärden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "Avbryt och återgå till översikten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "Återställning till standardvärden stöds inte för"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
@@ -12103,7 +12156,7 @@ msgstr ""
 "Några av de ändringar du gjort kräver en omstart. Starta Calibre så snart "
 "som möjligt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
@@ -12111,7 +12164,7 @@ msgstr ""
 "De ändringar du har gjort kräver att Calibre startas omedelbart. Du kommer "
 "inte få ändra några fler inställningar, tills du startar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "Omstart behövs"
@@ -13020,30 +13073,34 @@ msgid "The main toolbar"
 msgstr "Verktygsfältet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "Verktygsfältet när en enhet är ansluten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "Snabbmenyn för böcker i Calibre-biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "Snabbmenyn för de böcker på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "Kan inte lägga till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "Kan inte lägga till åtgärder %s till den här platsen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "Kan inte ta bort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "Kan inte ta bort åtgärder %s från denna plats"
 
@@ -13152,7 +13209,7 @@ msgstr "Tillämpa alla ändringar du gjort i denna ändring"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Sök"
@@ -13246,167 +13303,167 @@ msgstr "Klicka för att ändra"
 msgid "&Alternate shortcut:"
 msgstr "&Alternativ snabbtangent:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "Byt namn på %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr "Redigera sortering för %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr "Lägg %s till användarkategorin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr "Barn till %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
-msgstr ""
+msgstr "Ta bort sökningen %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr "Ta bort %s från kategorin %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "Sök %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "Sök efter allt utom %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr "Lägg underkategori till %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr "Radera användarkategorin %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Dölj kategori %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "Visa kategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "Sök efter böcker i kategorin %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "Sök efter böcker som inte tillhör kategorin %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "Hantera %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Hantera sparade sökningar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Hantera användarkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "Visa alla kategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr "Ändra sub-kategorisering systemet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr "De grupperade söktermsnamnet är \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr "Ändra författare till flera böcker kan ta ett tag. Är du säker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr "Ändra metadata för att många böcker kan ta ett tag. Är du säker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Sökningar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr "Byt namn på användarkategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 "Du kan inte använda punkter i namnet när du döper om användarkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr "Namnet %s används redan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "Kopiera sökningens namn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "Namnet %s för den sparade sökningen används redan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr "Ny kategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr "Radera användarkategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr "%s är inte en användarkategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr "%s innehåller poster. Vill du verkligen ta bort den?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr "Ta bort kategorin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr "Användarkategori %s existerar inte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr "Lägg till användarkategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr "En användarkategori %s finns inte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "Hitta objekt med etikettläsare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -13424,62 +13481,62 @@ msgstr ""
 "poster\n"
 "som innehåller texten \"foo\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT + F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "&Hitta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "Hitta första / nästa passande objekt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "Komprimera alla kategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 "Inga fler träffar. </ B> <p> Klicka på Sök igen för att gå till första "
 "träffen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Sortera efter namn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Sortera efter popularitet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Sortera efter medelbetyg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 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:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Matcha alla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Matcha någon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Hantera &användarkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "Lägg till egna kategorier i etikettbläddraren"
 
@@ -13558,23 +13615,23 @@ msgstr ""
 "Du har startat Caliber i felsökningsläge. När du har avslutat Caliber kommer "
 "felsökningsloggen finnas i filen: %s <p> logg visas automatiskt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /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:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "Recept inaktiverat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>Misslyckades</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 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:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -13584,11 +13641,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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "Aktiva jobb"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -13799,7 +13856,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "Alternativ för att anpassa läsplattan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "Kom ihåg senast använd fönsterstorlek"
 
@@ -13885,36 +13942,36 @@ msgstr ""
 "Du är mitt i redigering av ett kortkommando först avsluta det, genom att "
 "klicka utanför den genvägen redigering rutan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "&Leta i ordlista"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "Gå till..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "Nästa avsnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "Föregående avsnitt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "Dokumentets början"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "Dokumentets slut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "Avsnittets början"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "Avsnittets slut"
 
@@ -13990,75 +14047,75 @@ msgstr "Förhandsgranska"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "Ansluter till dict.org att slå upp: <b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "Välj e-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "E-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Inga träffar hittades för: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "Laddar flöde..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "Formaterar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "Bokmärk #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "Lägg till bokmärke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "Ange titel för bokmärke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "Hantera bokmärken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Laddar e-bok...."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "Kunde inte öppna e-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "Alternativ för att styra läsplattan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
 "Om angivet, kommer läsfönstret att försöka lägga sig överst vid start."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 "Om vald kommer visningsfönstret försöker öppna helskärm när den startas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "Skriv javaskriptnotifieringar och konsolmeddelanden till konsolen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -14136,27 +14193,27 @@ msgstr "Sök föregående förekomst"
 msgid "Print eBook"
 msgstr "Skriv ut e-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "Ändra skiftläge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "Byt skiftläge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "Drag för att ändra storlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "Visa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Dölj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "Växla"
 
@@ -14236,8 +14293,8 @@ msgid ""
 "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s "
 "button to apply your settings."
 msgstr ""
-"<h2>Grattis!</h2> Du har framgångsrikt installerat Calibre. Tryck på %s-"
-"knappen för att tillämpa inställningarna."
+"<h2>Gratulerar!</h2> Du har nu konfigurerat Calibre. Tryck på %s-knappen för "
+"att tillämpa dina inställningar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:50
 msgid ""
@@ -14387,6 +14444,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:219
 msgid "Please enter a username and password or set encryption to None "
 msgstr ""
+"Ange ett användarnamn och lösenord eller ställ in kryptering till Ingen "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:224
 msgid ""
@@ -14510,7 +14568,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:50
 msgid "Turn on the &content server"
-msgstr "Slå på och medieservern"
+msgstr "Aktivera &medieservern"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:161
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:565
@@ -15654,11 +15712,11 @@ msgstr ""
 "\n"
 "För hjälp med ett enskilt kommando: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "Ingen etikett angavs"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -15674,15 +15732,15 @@ msgstr "%sMedelbetyget är %3.1f"
 msgid "Main"
 msgstr "Allmänt"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migrera den gamla databasen till e-bokbibliotek i %s <br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "Kopierar <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "Komprimerar databas"
 
@@ -16904,95 +16962,95 @@ msgstr "Hämta inte senaste versionen av inbyggda recept från Calibre-servern"
 msgid "Unknown News Source"
 msgstr "Okänd nyhetskälla"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 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:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Hämtningen är färdig"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 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:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 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:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " från "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\tMisslyckade länkar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "Kunde inte hämta artikeln."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr "Den felsökningsspårning finns tidigare i denna logg"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr "Kör med -vv för att se orsaken"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "Hämtar flöden..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "Mottagit flöden från indexsidan"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Försöker hämta omslaget ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "Skapar redaktionsruta..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 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:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "Flöden hämtade till %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Kunde inte hämta omslag: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "Hämtar omslag från %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "Redaktionslogga hämtad"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Namnlös artikel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Artikel hämtad: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Artikeln kunde inte hämtas: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Hämtar flöde"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -17000,7 +17058,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -17239,9 +17297,6 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ msgid "TabWidget"
 #~ msgstr "TabWidget"
 
-#~ msgid "Toolbar"
-#~ msgstr "Verktygsrad"
-
 #~ msgid "calibre can send your books to you (or your reader) by email"
 #~ msgstr "calibre kan skicka böcker till dig (eller dina läsare) via e-post"
 
@@ -17607,6 +17662,9 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ msgid "Books located at"
 #~ msgstr "Böcker finns på"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Inget giltigt tillägg hittades i "
+
 #~ msgid "Communicate with the Kindle 2 eBook reader."
 #~ msgstr "Kommunicera med läsplattan Kindle 2."
 
@@ -18649,6 +18707,9 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ msgid "Communicate with the Promedia eBook reader"
 #~ msgstr "Kommunicera med Promedia eBook läsaren"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Anpassa verktygsfältet"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Kommunicera med Kogan"
 
@@ -18779,6 +18840,9 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ msgid "Apply function &after replace:"
 #~ msgstr "&Applicera funktion efter ersätta:"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "&Dela verktygsfältet i två verktygsfält"
+
 #~ msgid ""
 #~ " The red color indicates that the current author sort does not match the "
 #~ "current author"
@@ -19201,6 +19265,9 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ "på Redigera metadatadialogrutan\n"
 #~ "Bygg sedan om katalogen.\n"
 
+#~ msgid "Customize searching"
+#~ msgstr "Anpassa sökning"
+
 #~ msgid ""
 #~ "To use librarything.com you must sign up for a %sfree account%s and enter "
 #~ "your username and password separated by a : below."
diff --git a/src/calibre/translations/ta.po b/src/calibre/translations/ta.po
index c3ab4c700a..dd23df46cf 100644
--- a/src/calibre/translations/ta.po
+++ b/src/calibre/translations/ta.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-09-03 18:46+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Tamil <ta@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: 2011-03-27 04:48+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:51+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "நிச்சயமாக எதுவும் செய்யாது"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "நிச்சயமாக எதுவும் செய்யாத
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "நிச்சயமாக எதுவும் செய்யாத
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "நிச்சயமாக எதுவும் செய்யாத
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "நிச்சயமாக எதுவும் செய்யாத
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "நிச்சயமாக எதுவும் செய்யாத
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "நிச்சயமாக எதுவும் செய்யாத
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "நிச்சயமாக எதுவும் செய்யாத
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "அடிப்படை"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "கோப்பு வகை"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "தரவுகள் சுருக்கப் படிப்பி"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "தரவுகள் சுருக்க எழுதி"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "பட்டியல் உருவாக்கி"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "முன்னுரிமைகள்"
@@ -330,7 +330,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -649,35 +649,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -685,29 +681,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -729,106 +725,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -872,20 +880,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -893,8 +901,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -904,8 +912,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -913,17 +921,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1222,32 +1230,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1256,29 +1264,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1411,7 +1430,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2048,7 +2067,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2163,7 +2182,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2174,6 +2193,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2523,105 +2546,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3004,7 +3027,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3137,7 +3160,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3303,6 +3326,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3567,135 +3591,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3903,8 +3931,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4101,7 +4129,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4167,7 +4195,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4175,7 +4203,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4356,7 +4384,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4364,32 +4392,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4476,26 +4504,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4503,7 +4531,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4515,7 +4543,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4526,19 +4554,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4603,7 +4631,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4845,7 +4873,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5047,8 +5075,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5058,17 +5086,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5078,25 +5106,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5154,7 +5182,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5177,14 +5205,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5749,10 +5777,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6344,7 +6376,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6929,97 +6961,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7305,7 +7337,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7441,7 +7473,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7488,8 +7520,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7521,12 +7553,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7710,22 +7742,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9205,12 +9237,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9279,7 +9311,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9514,61 +9546,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9582,67 +9614,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9850,48 +9900,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9966,7 +10016,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9983,12 +10033,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10794,25 +10844,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10824,91 +10881,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10917,22 +10974,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10942,64 +10999,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11730,30 +11783,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11850,7 +11907,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11943,166 +12000,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12112,60 +12169,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12238,34 +12295,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12465,7 +12522,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12543,36 +12600,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12648,73 +12705,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12789,27 +12846,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13975,11 +14032,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13993,15 +14050,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15038,101 +15095,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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/te.po b/src/calibre/translations/te.po
index 6ae5c6ef44..1f60caccdc 100644
--- a/src/calibre/translations/te.po
+++ b/src/calibre/translations/te.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-01-09 02:04+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-27 04:48+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:51+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -325,8 +325,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr ""
+msgid "Toolbar"
+msgstr "పనిముట్ల పట్టీ"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "వార్తలు"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "పరికరంలో ఉన్న పుస్తకాల జాబితాని తెస్తున్నాం..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "శీర్షిక"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "రచయిత(లు)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "ప్రచురణకర్త"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "నిర్మాత"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "వ్యాఖ్యలు"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "భాష"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "కాలముద్ర"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "ప్రచురితం"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "హక్కులు"
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr "రచయిత"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "విషయం"
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "పుస్తకాలు లేవు"
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr "పొరపాటు"
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "శీర్షిక:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "రచయితలు:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "పరిమాణం (మెబై)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "తర్వాతి పేజీ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "చిన్న"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15246,9 +15303,6 @@ msgstr ""
 #~ msgid "Configuration"
 #~ msgstr "స్వరూపణం"
 
-#~ msgid "Toolbar"
-#~ msgstr "పనిముట్ల పట్టీ"
-
 #~ msgid "Category"
 #~ msgstr "వర్గం"
 
diff --git a/src/calibre/translations/th.po b/src/calibre/translations/th.po
index 8c093b0a9f..55509dea01 100644
--- a/src/calibre/translations/th.po
+++ b/src/calibre/translations/th.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2010-11-19 23:44+0000\n"
 "Last-Translator: sksy <songkit@gmail.com>\n"
 "Language-Team: Thai <th@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: 2011-03-27 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:52+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:430
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Set metadata in %s files"
 msgstr "ตั้งค่าข้อมูลใน %s ไฟล์"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "ไม่มีอะไรเลย"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -41,7 +41,7 @@ msgstr "ไม่มีอะไรเลย"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -58,9 +58,9 @@ msgstr "ไม่มีอะไรเลย"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -80,7 +80,7 @@ msgstr "ไม่มีอะไรเลย"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -126,19 +126,19 @@ msgstr "ไม่มีอะไรเลย"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -146,12 +146,12 @@ msgstr "ไม่มีอะไรเลย"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -162,11 +162,11 @@ msgstr "ไม่มีอะไรเลย"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -180,46 +180,46 @@ msgstr "ไม่มีอะไรเลย"
 msgid "Unknown"
 msgstr "ไม่รู้จัก"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "ฐาน"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "ชนิด"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "ตััวอ่่านชุดข้อมูล"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "ตัวเขียนชุดข้อมูล"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "ตัวสร้างแคทตาล็อก"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "การทำงานของส่วนติดต่อผู้ใช้"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "ปรับแต่ง"
@@ -331,8 +331,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "เพิ่ม/ลดคอลัมน์ของคุณเองในรายการหนังสือของ calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "ปรับเปลี่ยนทูลบาร์"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -343,7 +343,7 @@ msgstr ""
 "โดยกำหนดการเรียกใช้โปรแกรมในแต่ละเมนูและทูลบาร์"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -673,35 +673,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "ชุดข้อมูลนี้ใช้สำหรับ แซนด้า แบมบุค"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "ปลั้กอินที่ลงแล้วในเครื่อง"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "แผนผังสำหรับปลั้กอินที่ระบุว่าไฟล์รูปแบบใดจะใช้กับโปรแกรมใด"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "การปรับแต่งค่าโลคัลปลั้กอิน"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "พักใช้ปลั้กอิน"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "เรียกใช้ปลั้กอิน"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "ไม่พบปลั้กอินที่ใช้ได้ "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "ปลั้กอิน %s ที่เรียกใช้ไม่สามารถเรียกใช้ได้ดังแสดงในรายการผิดพลาดนี้"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -709,29 +705,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "การนำปลั้กอินออกโดยเรียงลำดับตามชื่อไม่มีผลกับปลั้กอินของระบบเอง"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "การปรับแต่งปลั้กอินโดยระบุชื่อและขั้นตัวอักษรด้วยคอมม่า"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "แสดงรายการปลั้กอินทั้งหมดที่ลงในระบบ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "เปิดใช้งานเนมปลั้กอิน"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "พักใช้งานเนมปลั้กอิน"
 
@@ -755,44 +751,56 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "ติดต่อกับโทรศัพท์ S60"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "จัดชุดเหมือนกับรูปแบบการจัดหมวดหมู่ใน iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "เก็บรูปปกจาก iTunes/iBooks ไว้ในหน่วยความจำชั่วคราว"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "อุปกรณ์ในกลุ่มของ Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "ติดต่อกับ iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "ตรวจพบอุปกรณ์ในกลุ่ม Apple กำลังดำเนินการเรียกใช้งาน iTunes โปรดอดใจรอ"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -801,27 +809,27 @@ msgstr ""
 "ใช้ลากจากไลบารี่ของไอจูนมาที่เดสก์ทอปก่อนจากนั้นค่อยดึงมาลงในไลบารี่ของคาลิเบ"
 "อร์"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "กำลังปรับปรุงชุดข้อมูลรายการอุปกรณ์ปลายทาง"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d จาก %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "เสร็จเรียบร้อย"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -831,7 +839,7 @@ msgstr ""
 "ลบหนังสือโดยใช้โปรแกรมใน iBooks\n"
 "กดปุ่ม 'แสดงรายละเอียด' เพื่อแสดงรายการ"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -839,31 +847,31 @@ msgstr ""
 "ลวดลายบางส่วนในปกไม่สามารถแปลงค่าได้\n"
 "กดปุ่ม 'แสดงรายละเอียด' เพื่อแสดงรายการ"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "ข่าว"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "บัญชีรายชื่อ"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "ติดต่อกับ iTunes"
 
@@ -907,20 +915,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "เรียกรายการหนังสือจากอุปกรณ์ปลายทาง"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "ถ่ายหนังสือลงในอุปกรณ์ปลายทาง"
 
@@ -928,8 +936,8 @@ msgstr "ถ่ายหนังสือลงในอุปกรณ์ปล
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "เพิ่มหนังสือในรายการชุดข้อมูลในอุปกรณ์ปลายทาง"
 
@@ -939,8 +947,8 @@ msgstr "เพิ่มหนังสือในรายการชุดข
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "ลบหนังสือออกจากอุปกรณ์ปลายทาง"
 
@@ -948,17 +956,17 @@ msgstr "ลบหนังสือออกจากอุปกรณ์ปล
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "ลบหนังสือออกจากรายการชุดข้อมูลในอุปกรณ์ปลายทาง"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "ส่งชุดข้อมูลไปยังอุปกรณ์ปลายทาง"
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1265,15 +1273,15 @@ msgstr "ติดต่อกับ Sony PRS-500 eBook reader"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "ติดต่อกับ Sony eBook reader"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1281,18 +1289,18 @@ msgstr ""
 "รายชื่อชุดข้อมูลฟิลด์คั่นด้วยคอมม่าจะถูกแปลงเป็นคอลเลคชั่นในอุปกรณ์ปลายทาง "
 "ส่วนใหญ่ได้แก่ "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1301,29 +1309,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1457,7 +1476,7 @@ msgstr "ปรับแต่งพิเศษ"
 msgid "Communicate with an eBook reader."
 msgstr "ติดต่อกับอีบุคส์รีดเดอร์"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "เรียกข้อมูลอุปกรณ์ปลายทาง"
 
@@ -2183,7 +2202,7 @@ msgstr "แปลงอินพุทเป็น HTML"
 msgid "Running transforms on ebook..."
 msgstr "กำลังทำการแปลงอีบุ๊ค"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "กำลังสร้าง"
 
@@ -2315,7 +2334,7 @@ msgstr "เริ่ม"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "ไม่ต้องใส่สารบาญไวัที่ตอนต้นของหนังสือ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2326,6 +2345,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2679,105 +2702,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -3160,7 +3183,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3293,7 +3316,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3459,6 +3482,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3723,135 +3747,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -4059,8 +4087,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4257,7 +4285,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4323,7 +4351,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4331,7 +4359,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4512,7 +4540,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4520,32 +4548,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4632,26 +4660,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4659,7 +4687,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4671,7 +4699,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4682,19 +4710,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4759,7 +4787,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -5001,7 +5029,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5203,8 +5231,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5214,17 +5242,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5234,25 +5262,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5310,7 +5338,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5333,14 +5361,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5905,10 +5933,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6500,7 +6532,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -7085,97 +7117,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7461,7 +7493,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7597,7 +7629,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7644,8 +7676,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7677,12 +7709,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7866,22 +7898,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9361,12 +9393,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9435,7 +9467,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9670,61 +9702,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9738,67 +9770,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -10006,48 +10056,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10122,7 +10172,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10139,12 +10189,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10950,25 +11000,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10980,91 +11037,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11073,22 +11130,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11098,64 +11155,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11886,30 +11939,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12006,7 +12063,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -12099,166 +12156,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12268,60 +12325,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12394,34 +12451,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12621,7 +12678,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12699,36 +12756,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12804,73 +12861,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12945,27 +13002,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14131,11 +14188,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14149,15 +14206,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15194,101 +15251,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15401,6 +15458,12 @@ msgstr ""
 #~ msgid " "
 #~ msgstr " "
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "ปรับเปลี่ยนทูลบาร์"
+
+#~ msgid "No valid plugin found in "
+#~ msgstr "ไม่พบปลั้กอินที่ใช้ได้ "
+
 #~ msgid "Communicate with the Nokia 810 internet tablet."
 #~ msgstr "ติดต่อกับ Nokia 810 internet tablet"
 
diff --git a/src/calibre/translations/tr.po b/src/calibre/translations/tr.po
index 0d8db9440f..f40aeb3331 100644
--- a/src/calibre/translations/tr.po
+++ b/src/calibre/translations/tr.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-01-07 20:53+0000\n"
 "Last-Translator: Ozgur Demirel <Unknown>\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: 2011-03-27 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:52+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Hiçbir şey yapmaz"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Hiçbir şey yapmaz"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Hiçbir şey yapmaz"
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Temel"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Dosya türü"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Metadata okuyucusu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Metadata yazıcısı"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Katalog oluşturucu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Kullanıcı Arayüzü Eylemi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Ayarlar"
@@ -333,8 +333,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Calibre kitap listesine kendi sütunlarınızı ekleyin/çıkarın"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Araç çubuğunu özelleştir"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -345,7 +345,7 @@ msgstr ""
 "çubuğunu ve kontekst (sağ tık) menüsünü özelleştir"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -675,35 +675,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Yüklü eklentiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Dosya türü eklentileri için eşleştirme"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Yerel eklenti özelleştirme"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Çalışmayan eklentiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Etkinleştirilmiş eklentiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "de geçerli bir eklenti bulunamadı. "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 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:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -715,18 +711,18 @@ msgstr ""
 "    Harici eklentiler yükleyerek Calibre'ye özelleştirin.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 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:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -734,15 +730,15 @@ msgstr ""
 "Eklentiyi özelleştir. Eklenti ismiyle özelleştirme dizesini virgülle "
 "ayırarak belirleyin."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Kurulu eklentileri listele"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "İsimlendirilmiş eklentiler geçerli"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "İsimlendirilmiş eklentiler geçersiz"
 
@@ -766,69 +762,81 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "S60 telefonlar ile haberleş."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Seri'yi iTunes/iBooks'ta Kategori olarak kullan"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "iTunes/iBooks'taki kapakları önbelleğe al"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple cihazı"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "iTunes/iBooks ile iletişim kur."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Apple aygıtı tespit edildi. iTunes açılıyor, lütfen bekleyin..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "tamamlandı"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -838,7 +846,7 @@ msgstr ""
 "iBooks uygulamasını kullanarak silin.\n"
 "Listeyi görmek için \"Ayrıntıları Göster\"e tıklayın."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -846,31 +854,31 @@ msgstr ""
 "Bazı kapak görselleri dönüştürülemedi.\n"
 "Listeyi görmek için \"Ayrıntıları Göster\"e tıklayın."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Haberler"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Katalog"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "iTunes ile iletişim kur."
 
@@ -914,20 +922,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Cihazdaki kitapların listesi alınıyor..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Kitaplar cihaza aktarılıyor..."
 
@@ -935,8 +943,8 @@ msgstr "Kitaplar cihaza aktarılıyor..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Donanım metadata listesine kitaplar ekleniyor ..."
 
@@ -946,8 +954,8 @@ msgstr "Donanım metadata listesine kitaplar ekleniyor ..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Cihazdaki kitaplar kaldırılıyor..."
 
@@ -955,17 +963,17 @@ msgstr "Cihazdaki kitaplar kaldırılıyor..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Donanım  metadata listesinden  kitaplar çıkarılıyor ..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Metadata bilgileri cihaza gönderiliyor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1264,32 +1272,32 @@ msgstr "Sony PRS-500 eBook reader ile bağlantı kur"
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1298,29 +1306,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1453,7 +1472,7 @@ msgstr "Ekstra kişiselleştirme"
 msgid "Communicate with an eBook reader."
 msgstr "e-Kitap okuyucusu ile haberleş."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Aygıt bilgisini al..."
 
@@ -2096,7 +2115,7 @@ msgstr "Girdi HTML ye çevriliyor ..."
 msgid "Running transforms on ebook..."
 msgstr "E-kitap dönüştürmeleri çalışıyor ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Oluşturuluyor"
 
@@ -2211,7 +2230,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Kitabın girişine bir içerik tablosu ekleme ."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2222,6 +2241,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2573,105 +2596,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Eser Adı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Yazar(lar)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Yayıncı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Yapımcı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Açıklamalar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Etiketler"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Seriler"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Dil"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Zaman damgası"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Yayınlandı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Haklar"
 
@@ -3054,7 +3077,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3187,7 +3210,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3353,6 +3376,7 @@ msgid "Author"
 msgstr "Yazar"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Konu"
 
@@ -3617,135 +3641,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Silmeden önce onayla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "dosyaları Seç"
 
@@ -3953,8 +3981,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4151,7 +4179,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4217,7 +4245,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4225,7 +4253,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4406,7 +4434,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4414,32 +4442,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4526,26 +4554,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4553,7 +4581,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4565,7 +4593,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4576,19 +4604,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4653,7 +4681,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4895,7 +4923,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Kitap yok"
 
@@ -5097,8 +5125,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5108,17 +5136,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5128,25 +5156,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5204,7 +5232,7 @@ msgstr "çıktı"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5227,14 +5255,14 @@ msgstr "çıktı"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5799,10 +5827,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr "FB2 Çıktısı"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6394,7 +6426,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Test"
 
@@ -6979,97 +7011,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7355,7 +7387,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7491,7 +7523,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7538,8 +7570,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7571,12 +7603,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7760,22 +7792,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9255,12 +9287,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9329,7 +9361,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9564,61 +9596,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9632,67 +9664,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Başlık:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9900,48 +9950,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Boyut (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10016,7 +10066,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10033,12 +10083,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10844,25 +10894,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10874,91 +10931,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10967,22 +11024,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10992,64 +11049,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11780,30 +11833,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11900,7 +11957,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11993,166 +12050,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12162,60 +12219,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12288,34 +12345,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12515,7 +12572,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12593,36 +12650,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12698,73 +12755,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12839,27 +12896,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14025,11 +14082,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14043,15 +14100,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15088,95 +15145,95 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Başlıksız Yazı"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "Besleme alınıyor"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -15184,7 +15241,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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15299,6 +15356,9 @@ msgstr "CSS stil yüklemeyin"
 #~ msgid "Toolbar icon size"
 #~ msgstr "Araç çubuğu simge boyutu"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "de geçerli bir eklenti bulunamadı. "
+
 #~ msgid "Communicate with the Nokia 810 internet tablet."
 #~ msgstr "Nokia 810 internet tablet ile bağlantı kur"
 
@@ -15349,3 +15409,6 @@ msgstr "CSS stil yüklemeyin"
 
 #~ msgid "  "
 #~ msgstr "  "
+
+#~ msgid "Customize the toolbar"
+#~ msgstr "Araç çubuğunu özelleştir"
diff --git a/src/calibre/translations/uk.po b/src/calibre/translations/uk.po
index dc81436cbe..9b4d10c17b 100644
--- a/src/calibre/translations/uk.po
+++ b/src/calibre/translations/uk.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-02-27 12:06+0000\n"
 "Last-Translator: Andriy Bodnyk <Unknown>\n"
 "Language-Team: Ukrainian <uk@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: 2011-03-27 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:52+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "Не робить абсолютно нічого"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "Не робить абсолютно нічого"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "Не робить абсолютно нічого"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "Не робить абсолютно нічого"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "Не робить абсолютно нічого"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "Не робить абсолютно нічого"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "Не робить абсолютно нічого"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "Не робить абсолютно нічого"
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Основне"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "Вигляд"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Не вдається налаштувати"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Тип файлу"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Читання метаданих"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Запис метаданих"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Генератор каталогу"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Налаштування"
@@ -330,8 +330,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Додати/видалити власну колонку зі списку книг calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Налаштувати панель"
+msgid "Toolbar"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -340,7 +340,7 @@ msgid ""
 msgstr "Налаштувати панель і контекстне меню"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -674,35 +674,31 @@ msgstr "Цей профіль призначений для B&N Nook Color"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "Цей профіль призначений для Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Встановлені додатки"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Призначення модулів типів файлів"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Налаштування локального плагіну"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Вимкнені додатки"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Увімкнені додатки"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "Не знайдено додатку в "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Ініціалізація додатку %s не вдалася з помилками:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -714,16 +710,16 @@ msgstr ""
 "    Налаштуйте Calibre, використовуючи зовнішні додатки.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Видалити плагіни за назвою. Не впливає на встроєні плагіни."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -731,15 +727,15 @@ msgstr ""
 "Налаштуйте плагін під себе. Вкажіть назву плагіну та рядок налаштування, "
 "розділені комою."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Список всіх встановлених плагінів"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Ввімкніть вибраний плагін"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Вимкніть вибраний плагін"
 
@@ -763,43 +759,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Зв'язується з телефонами на базі операційної системи \"S60\""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "Використати Серії як Категорії в iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "Кешувати обкладинку з iTunes/iBooks"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Пристрої Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Зв'язується з iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "Пристрій Apple виявлено, запуск iTunes, будь ласка, зачекайте ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
@@ -807,27 +815,27 @@ msgstr ""
 "Неможливо скопіювати книги напряму з пристрою. Перетягніть з бібліотеки "
 "iTunes на робочий стіл, після чого додайте до бібліотеки calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Оновлення списку метаданих пристрою…"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d з %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "завершено"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -837,7 +845,7 @@ msgstr ""
 "Видалити за допомогою додатку iBooks.\n"
 "Натисніть \"Показати деталі\" для списку."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -845,31 +853,31 @@ msgstr ""
 "Деякі обкладинки не можуть бути конвертовані.\n"
 "Натисніть кнопку \"Показати деталі\" для списку."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Новини"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "Каталог"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Зв’язується з iTunes."
 
@@ -919,20 +927,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "Отримую список книжок з пристрою..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Передаю книжки до пристрою..."
 
@@ -940,8 +948,8 @@ msgstr "Передаю книжки до пристрою..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Додаю книжки до списку метаданих на пристрої..."
 
@@ -951,8 +959,8 @@ msgstr "Додаю книжки до списку метаданих на при
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Видаляю книжки з пристрою..."
 
@@ -960,17 +968,17 @@ msgstr "Видаляю книжки з пристрою..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Видаляю книжки з списку метаданих на пристрої..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Висилаю метадані до пристрою..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Не встановлено Bambook SDK"
 
@@ -1275,15 +1283,15 @@ msgstr "Зв’язуєтья з Sony PRS-500 eBook reader."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Зв’язується з Sony eBook readers."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "Усі по назві"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "Усі по автору"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
@@ -1291,18 +1299,18 @@ msgstr ""
 "Список полів метаданих, розділений комами, перетворити в колекції на "
 "пристрої. Можливості включають: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1311,29 +1319,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1471,7 +1490,7 @@ msgstr "Додаткове налаштування"
 msgid "Communicate with an eBook reader."
 msgstr "Зв’язуюся з eBook reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Отримую інформацію про пристрій..."
 
@@ -2181,7 +2200,7 @@ msgstr "Конвертую вхідний файл в HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Виконую перетворення книги…"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Створюю"
 
@@ -2301,7 +2320,7 @@ msgstr "Старт"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Не вставляти зміст на початку книги."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2312,6 +2331,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2682,105 +2705,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr "Помилка шаблону"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "Ні"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "Так"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Заголовок"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Автор(и)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Видавець"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Виробник (продюсер)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Коментарі"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Теґи"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Серія"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Мова"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Мітка часу"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Опубліковано"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Права"
 
@@ -3183,7 +3206,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3316,7 +3339,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML TOC параметри створення."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3505,6 +3528,7 @@ msgid "Author"
 msgstr "Автор"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Тема"
 
@@ -3793,137 +3817,141 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Надсилати файл на картку пам’яті замість основної пам’яті за замовчуванням"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Підтвердити перед видаленням"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "Геометрія головного вікна"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Повідомити про появу нової версії"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Використовувати римські цифри для номерів серії"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Сортувати теґи за ім’ям, популярністю чи оцінками"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Кількість обкладинок, що показуватиметься в режимі перегляду за обкладинками"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "Перетворювати за замовчуванням у LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "Параметри перегляду LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Формати перегляду з використанням вбудованого оглядача"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Стовпці будуть відображені у списку книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "Автоматично запускати сервер під час запуску програми"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "Старі новини зберігаються в базі даних"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Показувати іконку в панелі завдань"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "Завантажити на пристрій закачані новини"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Видалити книги з бібліотеки після завантаження на пристрій"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "Показати обкладинку в окремому вікні замість основного вікна calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Відключити повідомлення від іконки в системному треї"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "Дія за замовчуванням при натисканні кнопки \"надіслати до пристрою\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "Максимальна кількість робочих процесів, що очікують"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Завантажити соціальні метадані (теґи/оцінки/тощо)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Переписати автора і назву з нових метаданих"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Обмежити максимум одночасних завдань кількістю процесорів CPU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Розташування користувацького інтерфейсу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Показувати середню оцінку при перегляді теґа"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "Відключити анімацію користувацького інтерфейсу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "помітити категорії перегляду для невідображення"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Виберіть файли"
 
@@ -4138,8 +4166,8 @@ msgstr "Створювати користувацькі аннотації ті
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "Не вибрано книги"
@@ -4339,7 +4367,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4407,7 +4435,7 @@ msgid "Bulk convert"
 msgstr "Загальне перетворення"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Не вдалося перетворити"
 
@@ -4415,7 +4443,7 @@ msgstr "Не вдалося перетворити"
 msgid "Starting conversion of %d book(s)"
 msgstr "Підготовка перетворення %d книг(и)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4599,7 +4627,7 @@ msgid "Stop Content Server"
 msgstr "Зупинити контент сервер"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Надіслати email до"
 
@@ -4607,32 +4635,32 @@ msgstr "Надіслати email до"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "Налаштувати спільний доступ на основі електронної пошти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Надіслати до пристрою"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Під'єднатись/роздати"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4719,26 +4747,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Неможливо редагувати метадані"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "Неможливо злити книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4746,7 +4774,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4758,7 +4786,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4769,19 +4797,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Вибірка новин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "Отримання новин з "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4846,7 +4874,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "Запустити майстра початкових налаштувань"
 
@@ -5091,7 +5119,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5293,8 +5321,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5304,17 +5332,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Формати"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5324,25 +5352,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5400,7 +5428,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5423,14 +5451,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5995,10 +6023,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr "Вивід в FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6590,7 +6622,7 @@ msgid "Regex:"
 msgstr "Регулярний вираз:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Тест"
 
@@ -7175,97 +7207,97 @@ msgstr "Помилка"
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Немає відповідних форматів"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "обрано для насилання"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Вибрати формат для надсилання"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Не вдається відправити: прийстрій не під'єднано"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Не вдається відправити: пристрій не має картки памя'ті"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "Надсилання каталогу на пристрій"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Надсилання новин на пристрій"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Надсилання кнги на пристрій"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7551,7 +7583,7 @@ msgstr "Обрати формат"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7687,7 +7719,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7734,8 +7766,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7767,12 +7799,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7956,22 +7988,22 @@ msgid "Working"
 msgstr "Працюю"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Нижній регістр"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Верхній регістр"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Як в заголовках"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9454,12 +9486,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9528,7 +9560,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "&Тест"
 
@@ -9763,63 +9795,63 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Новини:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Надсилаю електронну пошту  до"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Автоматично конвертувати наступні книги перед відправкою по електронній "
 "пошті?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Надіслати новини на"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9833,67 +9865,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "Немає збігів"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "Автори:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "Переглядач обкладинок"
@@ -10101,48 +10151,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "Розмір (Мб)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10217,7 +10267,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10234,12 +10284,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -11046,25 +11096,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "Електронна пошта"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "нова адреса електронної пошти"
 
@@ -11076,91 +11133,91 @@ msgstr "Вузький"
 msgid "Wide"
 msgstr "Широкий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "Малий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "Великий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "Завжди"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "Ніколи"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "Обрати &мову"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Показувати &середні оцінки в переглядачі тегів"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11169,22 +11226,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11194,64 +11251,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "Панель &інструментів"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "&Застосувати"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "Зберегти зміни"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11982,30 +12035,34 @@ msgid "The main toolbar"
 msgstr "Основна панель інструментів"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12102,7 +12159,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "Пошук"
@@ -12195,166 +12252,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "Сховати категорію %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "Управління збереженими пошуками"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "Управління категоріями користувача"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "Пошуки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12364,62 +12421,62 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "Сортувати за назвою"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "Сортувати за популярністю"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Сортувати за середньою оцінкою"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "Повний збіг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "Будь-який збіг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "Управління категоріями &користувача"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12492,34 +12549,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Помилка перетворення"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Є актиівні завдання. Ви хочете вийти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12719,7 +12776,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12797,36 +12854,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12902,73 +12959,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "Не знайдено збігів для: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "Завантаження книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13043,27 +13100,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "Сховати"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14229,11 +14286,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14247,15 +14304,15 @@ msgstr "%sСередня оцінка %3.1f"
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15292,101 +15349,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr "Невідоме джерело новин"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "Завантаження завершено"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " з "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "Пробую завантажити обкладинку..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "Не вадлос завантажити обкладинку: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "Стаття без назви"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "Стаття завантажена: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "Не вдалось завантажити статтю: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15579,6 +15636,9 @@ msgstr "Не завантажено CSS стилі."
 #~ msgid "Communicate with the BeBook Mini eBook reader."
 #~ msgstr "Зв'язок з пристроєм BeBook Mini"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Налаштувати панель"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Зв’язується з Kogan"
 
@@ -15598,6 +15658,9 @@ msgstr "Не завантажено CSS стилі."
 #~ "Не вдалося визначити диск %s. Можливо, ваше ядро використовує застарілу "
 #~ "версію SYSFS."
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "Не знайдено додатку в "
+
 #~ msgid "Output directory. Defaults to current directory"
 #~ msgstr "Вихідна директорія. Використовується за замовчуванням"
 
diff --git a/src/calibre/translations/ur.po b/src/calibre/translations/ur.po
index 73db9eee1a..4cf26c1a1a 100644
--- a/src/calibre/translations/ur.po
+++ b/src/calibre/translations/ur.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2010-10-18 00:39+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-02 21:19+0000\n"
+"Last-Translator: mahmood <Unknown>\n"
 "Language-Team: Urdu <ur@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: 2011-03-27 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-04-03 04:39+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr ""
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "بنیاد"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
-msgstr ""
+msgstr "اپنی ضرورت کے مطابق ردوبدل کریں"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
-msgstr ""
+msgstr "وضع نہیں کرسکتے"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
-msgstr ""
+msgstr "فائل کی قسم"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
-msgstr ""
+msgstr "میٹا ڈیٹا ریڈر"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
-msgstr ""
+msgstr "میٹا ڈیٹا رائٹر"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
-msgstr ""
+msgstr "کیٹلاگ جنریٹر"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "ترجیحات"
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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 2bb46eb0c2..dc5e144f10 100644
--- a/src/calibre/translations/vi.po
+++ b/src/calibre/translations/vi.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
-"PO-Revision-Date: 2010-10-08 20:51+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
+"PO-Revision-Date: 2011-04-06 07:37+0000\n"
+"Last-Translator: Hoang Tran Khanh <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: 2011-03-27 04:50+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-07 04:35+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "hoàn toàn không thực thi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "hoàn toàn không thực thi"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "hoàn toàn không thực thi"
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "Cơ sở"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
-msgstr ""
+msgstr "Tùy chỉnh"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "Không thể thiết lập cấu hình"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "Kiểu tập tin"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "Đọc thông tin mô tả"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "Bộ ghi siêu dữ liệu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "Khởi tạo danh mục"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "Thao tác giao diện người dùng"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "Tùy chỉnh"
@@ -249,6 +249,8 @@ msgid ""
 "Textile references to images. The referenced images as well as the TXT file "
 "are added to the archive."
 msgstr ""
+"Tạo tập tin nén TXTZ khi nhập tập tin TXT có sử dụng Markdown hoặc Textile "
+"liên quan đến hình ành. Mọi ảnh được đề cập và tập tin TXT sẽ được nén lại."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
 msgid "Extract cover from comic files"
@@ -333,8 +335,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "Thêm/bớt cột cho danh mục sách trong calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "Tùy chỉnh thanh công cụ"
+msgid "Toolbar"
+msgstr "Thanh công cụ"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -343,12 +345,12 @@ msgid ""
 msgstr "Tùy chỉnh thanh công cụ và menu ngữ cảnh"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr ""
+msgid "Searching"
+msgstr "Đang tìm kiếm"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
-msgstr ""
+msgstr "Tùy chỉnh cách tìm sách trong calibre"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:879
 msgid "Input Options"
@@ -421,7 +423,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:954
 msgid "Change metadata fields before saving/sending"
-msgstr ""
+msgstr "Thay đổi thông tin mô tả trước khi lưu/gửi"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:959
 msgid "Template Functions"
@@ -509,7 +511,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:234
 msgid "Conversion Output"
-msgstr ""
+msgstr "Chuyển đổi đầu ra"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:248
 msgid ""
@@ -622,12 +624,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:437
 msgid "Intended for generic tablet devices, does no resizing of images"
 msgstr ""
+"Dùng cho thiết bị máy tính bảng thông dụng, không thay đổi kích thước ảnh."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:445
 msgid ""
 "Intended for the Samsung Galaxy and similar tablet devices with a resolution "
 "of 600x1280"
 msgstr ""
+"Dùng cho Samsung Galaxy và các thiết bị tương tự với độ phân giải 600x1280"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:471
 msgid "This profile is intended for the Kobo Reader."
@@ -639,11 +643,11 @@ msgstr "Hồ sơ này dùng cho Sony PRS-300"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:502
 msgid "Suitable for use with any e-ink device"
-msgstr ""
+msgstr "Dùng cho mọi thiết bị e-ink"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:509
 msgid "Suitable for use with any large screen e-ink device"
-msgstr ""
+msgstr "Dùng cho mọi thiết bị e-ink màn hình lớn"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:518
 msgid "This profile is intended for the 5-inch JetBook."
@@ -663,41 +667,37 @@ msgstr "Hồ sơ này dùng cho Amazon Kindle DX"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:712
 msgid "This profile is intended for the B&N Nook Color."
-msgstr ""
+msgstr "Dùng cho B&N Nook Color."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:723
 msgid "This profile is intended for the Sanda Bambook."
-msgstr ""
+msgstr "Dùng cho Sanda Bambook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "Các plugin đã được cài đặt"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "Bản đồ cho plugin kiểu tập tin"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "Tuỳ chỉnh các plugin hiện có"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "Các plugin đã bị vô hiệu hoá"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "Các plugin đang được sử dụng"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-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:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Quá trình khởi chạy plugin %s thất bại với các thông tin sau"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -705,18 +705,18 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Thêm một plugin bằng cách chỉ ra đường dẫn tới tập tin nén zip chứa nó."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Xoá một plugin tự tạo theo tên. Không có tác dụng với các plugin đi kèm phần "
 "mềm."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -724,15 +724,15 @@ msgstr ""
 "Tuỳ biến plugin. Ghi rõ tên của plugin và chuỗi tùy biến cách nhau bằng dấu "
 "phẩy."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "Liệt kê tất cả các plugin đã được cài đặt."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "Cho phép khởi chạy plugin có tên sau"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "Vô hiệu hóa plugin có tên sau"
 
@@ -756,71 +756,85 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr "Giao tiếp với điện thoại S60."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Thiết bị của Apple"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "Giao tiếp với iTunes/iBooks."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 "Phát hiện thiết bị do Apple sản xuất, khởi chạy iTunes, xin đợi trong giây "
 "lát ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
+"Không thể sao chép sách trực tiếp từ iDevice. Kéo và thả từ iTunes Library "
+"ra desktop, rồi Kéo và thả vào cửa sổ Thư viện calibre."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "Cập nhật danh mục thông tin mô tả của thiết bị ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d của %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "đã hoàn tất"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -830,7 +844,7 @@ msgstr ""
 "Xoá thông qua ứng dụng iBoooks.\n"
 "Nhấn vào \"Xem chi tiết\" để hiển thị danh sách."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -838,56 +852,59 @@ msgstr ""
 "Một số ảnh bìa sẽ không được chuyển đổi định dạng.\n"
 "Nhấn vào \"Xem chi tiết\" để xem danh sách."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "Tin tức"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "Giao tiếp với iTunes."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:24
 msgid "Communicate with the Sanda Bambook eBook reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Sanda Bambook"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:25
 msgid "Li Fanxi"
-msgstr ""
+msgstr "Li Fanxi"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:42
 msgid "Device IP Address (restart calibre after changing)"
-msgstr ""
+msgstr "Địa chỉ IP của thiết bị (khởi động lại calibre sau khi thay đổi)"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:47
 msgid ""
 "Unable to add book to library directly from Bambook. Please save the book to "
 "disk and add the file to library from disk."
 msgstr ""
+"Không thể thêm sách trực tiếp từ Bambook. Vui lòng lưu sách vào đĩa cứng và "
+"thêm tập tin sách vào thư viện từ đĩa."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:67
 msgid ""
 "Unable to connect to Bambook, you need to install Bambook library first."
 msgstr ""
+"Không thể kết nối đến Bambook, bạn cần cài đặt Bambook library trước."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:75
 msgid ""
@@ -895,10 +912,13 @@ msgid ""
 "If you are trying to connect via Wi-Fi, please make sure the IP address of "
 "Bambook has been correctly configured."
 msgstr ""
+"Không thể kết nối đến Bambook \n"
+"Nếu bạn đang thử kết nối qua Wi-Fi, xin bảo đảm là địa chỉ IP của Bambook đã "
+"được cấu hình đúng."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:112
 msgid "Bambook"
-msgstr ""
+msgstr "Bambook"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:218
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:234
@@ -906,20 +926,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 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/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "Đang chuyển sách sang thiết bị ..."
 
@@ -927,8 +947,8 @@ msgstr "Đang chuyển sách sang thiết bị ..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "Đang thêm sách vào danh mục thông tin mô tả trên thiết bị..."
 
@@ -938,8 +958,8 @@ msgstr "Đang thêm sách vào danh mục thông tin mô tả trên thiết bị
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "Đang xoá sách khỏi thiết bị ..."
 
@@ -947,19 +967,19 @@ msgstr "Đang xoá sách khỏi thiết bị ..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "Đang xóa sách khỏi danh mục thông tin mô tả trên thiết bị..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "Đang chuyển thông tin mô tả sang thiết bị..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
-msgstr ""
+msgstr "Bambook SDK chưa được cài đặt."
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
@@ -982,7 +1002,7 @@ msgstr "Giao tiếp với Cybook Gen 3 / Opus eBook reader"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:64
 msgid "Communicate with the Cybook Orizon eBook reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Cybook Orizon."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:25
 msgid "Communicate with the EB600 eBook reader."
@@ -998,11 +1018,11 @@ msgstr "Giao tiếp với PocketBook 301 reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:233
 msgid "Communicate with the PocketBook 602/603/902/903 reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách PocketBook 602/603/902/903."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:252
 msgid "Communicate with the PocketBook 701"
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách PocketBook 701."
 
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
@@ -1010,7 +1030,7 @@ msgstr "Entourage Edge"
 
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Entourage Edge."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
@@ -1047,6 +1067,8 @@ msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
 msgstr ""
+"Dùng dấu phẩy tách danh sách các thư mục trên thiết bị có thể gửi e-book "
+"đến. Thư mục đầu tiên tồn tại sẽ được dùng."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:22
 msgid "Communicate with the Hanvon N520 eBook reader."
@@ -1080,7 +1102,7 @@ msgstr "John Schember"
 
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:54
 msgid "Cannot get files from this device"
-msgstr ""
+msgstr "Không thể lấy các tập tin từ thiết bị."
 
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
@@ -1104,7 +1126,7 @@ msgstr "Giao tiếp với MiBuk Wolder reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:116
 msgid "Communicate with the JetBook Mini reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách JetBook Mini."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/apnx.py:28
 msgid "Not a valid MOBI file. Reports identity of %s"
@@ -1180,11 +1202,11 @@ msgstr "Giao tiếp với Palm Pre"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:39
 msgid "Communicate with the Bq Avant"
-msgstr ""
+msgstr "Giao tiếp với Bq Avant"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:60
 msgid "Communicate with the Sweex/Kogan/Q600/Wink"
-msgstr ""
+msgstr "Giao tiếp với Sweex/Kogan/Q600/Wink"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:81
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:108
@@ -1193,7 +1215,7 @@ msgstr "Giao tiếp với Pandigital Novel"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:127
 msgid "Communicate with the VelocityMicro"
-msgstr ""
+msgstr "Giao tiếp với VelocityMicro"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:145
 msgid "Communicate with the GM2000"
@@ -1201,23 +1223,23 @@ msgstr "Giao tiếp với GM2000"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:165
 msgid "Communicate with the Acer Lumiread"
-msgstr ""
+msgstr "Giao tiếp với Acer Lumiread"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:199
 msgid "Communicate with the Aluratek Color"
-msgstr ""
+msgstr "Giao tiếp với Aluratek Color"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:219
 msgid "Communicate with the Trekstor"
-msgstr ""
+msgstr "Giao tiếp với Trekstor"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:239
 msgid "Communicate with the EEE Reader"
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách EEE"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:259
 msgid "Communicate with the Nextbook Reader"
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Nextbook"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
@@ -1225,7 +1247,7 @@ msgstr "Giao tiếp với Nokia 770"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810/900 internet tablet."
-msgstr ""
+msgstr "Giao tiếp với Nokia 810/900"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:74
 msgid "Communicate with the Nokia E52"
@@ -1241,11 +1263,11 @@ msgstr "Giao tiếp với Nook eBook reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:85
 msgid "Nook Color"
-msgstr ""
+msgstr "Nook Color"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:86
 msgid "Communicate with the Nook Color eBook reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Nook Color"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
@@ -1259,32 +1281,32 @@ msgstr "Giao tiếp với Sony PRS-500 eBook reader."
 msgid "Communicate with all the Sony eBook readers."
 msgstr "Giao tiếp với Sony eBook readers."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1293,29 +1315,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1335,11 +1368,11 @@ msgstr "Giao tiếp với Newsmy reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:47
 msgid "Communicate with the Archos reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Archos."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:57
 msgid "Communicate with the Pico reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Pico."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:67
 msgid "Communicate with the iPapyrus reader."
@@ -1347,19 +1380,19 @@ msgstr "Giao tiếp với iPapyrus reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:78
 msgid "Communicate with the Sovos reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Sovos"
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:88
 msgid "Communicate with the Sunstech EB700 reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Sunstech EB700"
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:99
 msgid "Communicate with the Stash W950 reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Stash W950"
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:111
 msgid "Communicate with the Wexler reader."
-msgstr ""
+msgstr "Giao tiếp với thiết bị đọc sách Wexler"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:282
 msgid "Unable to detect the %s disk drive. Try rebooting."
@@ -1448,7 +1481,7 @@ msgstr "Tuỳ biến thêm"
 msgid "Communicate with an eBook reader."
 msgstr "Giao tiếp với một thiết bị đọc sách điện tử"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "Lấy thông tin về thiết bị"
 
@@ -2150,7 +2183,7 @@ msgstr "Đang chuyển đổi tập tin đầu vào sang HTML..."
 msgid "Running transforms on ebook..."
 msgstr "Đang thay đổi sách điện tử"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "Đang tạo"
 
@@ -2282,7 +2315,7 @@ msgstr "Bắt đầu"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "Không thêm Mục lục vào phần đầu của sách"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2293,6 +2326,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2655,105 +2692,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "Tựa đề"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "Tác giả"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "Nhà xuất bản"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "Chủ nhiệm"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "Lời bình/chú thích"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "Thẻ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "Bộ sách"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "Mốc thời gian"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "Đã xuất bản"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "Quyền"
 
@@ -3154,7 +3191,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3287,7 +3324,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3472,6 +3509,7 @@ msgid "Author"
 msgstr "Tác giả"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "Chủ đề"
 
@@ -3745,135 +3783,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "Xác nhận trước khi xóa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "Thông báo khi có phiên bản mới"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "Sử dụng chữ số La Mã cho số thứ tự của sách trong bộ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "Sắp xếp danh sách thẻ theo tên, mức phổ biến hoặc điểm số"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "Các định dạng được xem bằng calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "Những cột được hiển thị trong danh mục sách"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "Hiện biểu tượng trên khay hệ thống"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "Xóa sách trong thư viện sau khi tải lên thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "Vô hiệu hoá thông báo từ biểu tượng trên khay hệ thống"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "Tải thông tin mô tả mang tính xã hội (thẻ/điểm số/v.v.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "Ghi đè tác giả và tựa đề với thông tin mô tả mới"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "Giới hạn số tác vụ đồng thời tối đa bằng với số CPU"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "Bố cục của giao diện người dùng"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "Hiển thị điểm số trung bình cho mỗi mục trong trình duyệt thẻ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "Chọn tập tin"
 
@@ -4087,8 +4129,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4287,7 +4329,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4355,7 +4397,7 @@ msgid "Bulk convert"
 msgstr "Chuyển đổi hàng loạt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "Không thề chuyển đổi"
 
@@ -4363,7 +4405,7 @@ msgstr "Không thề chuyển đổi"
 msgid "Starting conversion of %d book(s)"
 msgstr "Bắt đầu chuyển đổi %d cuốn sách"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4546,7 +4588,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "Gửi thư điện tử đến"
 
@@ -4554,32 +4596,32 @@ msgstr "Gửi thư điện tử đến"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "Gửi đến thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "Kết nối/chia sẻ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4666,26 +4708,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "Không thể thay đổi thông tin mô tả"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4693,7 +4735,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4705,7 +4747,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4716,19 +4758,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "Lấy tin tức"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " đã lấy."
 
@@ -4793,7 +4835,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -5041,7 +5083,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Không có sách"
 
@@ -5252,8 +5294,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "Đường dẫn"
 
@@ -5263,17 +5305,17 @@ msgstr "Đường dẫn"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "Định dạng"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5283,25 +5325,25 @@ msgid "Click to open"
 msgstr "Nhấn để mở"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5359,7 +5401,7 @@ msgstr "tập tin xuất"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5382,14 +5424,14 @@ msgstr "tập tin xuất"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5954,10 +5996,14 @@ msgstr "Không chèn &Mục Lục vào phần đầu sách."
 msgid "FB2 Output"
 msgstr "Xuất  FB2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6556,7 +6602,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "Kiểm tra"
 
@@ -7146,21 +7192,21 @@ msgstr "Lỗi"
 msgid "Error communicating with device"
 msgstr "Lỗi giao tiếp với thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "Không có định dạng phù hợp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "Chọn thư mục để kết nối như một thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "Lỗi giao tiếp với thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -7168,67 +7214,67 @@ msgstr ""
 "Có lỗi tạm thời khi giao tiếp với thiết bị. Xin thử tháo rồi kết nối lại "
 "thiết bị hoặc khởi động lại."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "Thiết bị "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " đã phát hiện."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "được chọn để gửi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "Chọn định dạng để gửi đến thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "Không có thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "Không thể gửi: Chưa có thiết bị được kết nối"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "Không có thẻ nhớ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "Không thể gửi: Thiết bị không có thẻ lưu trữ/thẻ nhớ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Tự động chuyển đổi những cuốn sách sau trước khi tải lên thiết bị?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "Đang gửi tin đến thiết bị."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "Đang gửi sách đến thiết bị."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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."
@@ -7236,11 +7282,11 @@ msgstr ""
 "Không thể tải những cuốn sách sau lên thiết bị vì chúng không có định dạng "
 "phù hợp. Chuyển đổi chúng sang định dạng mà thiết bị của bạn hỗ trợ."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "Không còn chỗ trống trên thiết bị"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>Không thể tải sách lên thiết bị vì không còn chỗ trống "
@@ -7527,7 +7573,7 @@ msgstr "Chọn định dạng"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "Định dạng"
 
@@ -7664,7 +7710,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7713,8 +7759,8 @@ msgid "Location"
 msgstr "Đường dẫn"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7746,12 +7792,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "Tên tác giả không hợp lệ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "Tên tác giả không được chứa kí tự &."
 
@@ -7941,22 +7987,22 @@ msgid "Working"
 msgstr "Đang làm việc"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "Chữ in thường"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "Chữ in hoa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "Chữ Hoa Đầu Từ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9436,12 +9482,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9510,7 +9556,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9745,63 +9791,63 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "Tin tức:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "Sách điện tử:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "Gửi thư điện tử đến"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Tự động chuyển đổi những cuốn sách sau trước khi gửi qua thư điện tử?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Không thể gửi những cuốn sách sau vì chúng không có định dạng phù hợp:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "Gửi tin đến"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9815,67 +9861,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9960,7 +10024,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Cannot kill jobs that communicate with the device"
-msgstr ""
+msgstr "Không thể dừng các tác vụ giao tiếp với thiết bị."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:223
 msgid "Job has already run"
@@ -10083,48 +10147,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -10199,7 +10263,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -10216,12 +10280,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -11027,25 +11091,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -11057,91 +11128,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "Hiển thị điểm số trung bình trong trình duyệt thẻ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11150,22 +11221,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11175,64 +11246,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11967,30 +12034,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -12087,7 +12158,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -12180,166 +12251,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12349,60 +12420,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "Sắp xếp theo điểm số trung bình"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12475,34 +12546,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12702,7 +12773,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12780,36 +12851,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12885,73 +12956,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13026,27 +13097,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -14215,11 +14286,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14233,15 +14304,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15278,101 +15349,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15505,6 +15576,9 @@ msgstr ""
 #~ msgid " "
 #~ msgstr " "
 
+#~ 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 "
+
 #~ msgid "Output directory. Defaults to current directory"
 #~ msgstr "Thư mục xuất. Mặc định là thư mục hiện tại"
 
@@ -15526,6 +15600,9 @@ msgstr ""
 #~ msgid "  "
 #~ msgstr "  "
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "Tùy chỉnh thanh công cụ"
+
 #~ msgid "Communicate with the Kogan"
 #~ msgstr "Giao tiếp với Kogan"
 
@@ -15667,3 +15744,12 @@ msgstr ""
 #~ "No metadata found, try adjusting the title and author or the ISBN key."
 #~ msgstr ""
 #~ "Không tìm thấy thông tin mô tả, thử điều chỉnh tựa đề và tác giả hoặc số ISBN"
+
+#~ msgid "Customize searching"
+#~ msgstr "Tùy chỉnh tìm kiếm"
+
+#~ msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
+#~ msgstr "Chọn để bỏ qua hộp thoại gợi ý 'Kết nối đến iTunes'"
+
+#~ msgid "Skip 'Connect to iTunes' recommendation"
+#~ msgstr "Bỏ qua gợi ý 'Kết nối đến iTunes'"
diff --git a/src/calibre/translations/yi.po b/src/calibre/translations/yi.po
index 76952ce9ec..86473d402b 100644
--- a/src/calibre/translations/yi.po
+++ b/src/calibre/translations/yi.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2009-09-04 22:02+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Yiddish <yi@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: 2011-03-27 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:53+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr ""
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr ""
 msgid "Unknown"
 msgstr "אומבאקאנט"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "פֿײַל(File) גרופּע"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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 bd87a3c8ca..7a196690fc 100644
--- a/src/calibre/translations/zh_CN.po
+++ b/src/calibre/translations/zh_CN.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-02-23 10:00+0000\n"
 "Last-Translator: 冯超 <rainofchaos@gmail.com>\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: 2011-03-27 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:54+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Language: Chinese\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "不做任何处理"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -36,7 +36,7 @@ msgstr "不做任何处理"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -53,9 +53,9 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -75,7 +75,7 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -121,19 +121,19 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -141,12 +141,12 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -157,11 +157,11 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -175,46 +175,46 @@ msgstr "不做任何处理"
 msgid "Unknown"
 msgstr "未知"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "基于"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "定制"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "无法配置"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "文件类型"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "元数据读取器"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "元数据生成器"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "分类生成器"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "用户界面操作"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "首选项"
@@ -330,8 +330,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "向 Calibre 书籍列表中增加或删除你自定义的栏目"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "自定义工具栏"
+msgid "Toolbar"
+msgstr "工具栏"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -340,7 +340,7 @@ msgid ""
 msgstr "自定义工具栏和上下文菜单，设置它们所可以提供的功能"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -649,35 +649,31 @@ msgstr "该配置文件适用 B&N Nook Color 阅读器。"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "该配置文件适用盛大锦书(Bambook)。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "已安装插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "关联插件文件类型"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "本地插件定制"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "禁用插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "启用的插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "无有效插件位于 "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "插件 %s 初始化返回失败回溯："
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -689,29 +685,29 @@ msgstr ""
 "    通过加载外部插件定制 Calibre。\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "按名称移除自定义插件(对内置插件无效)。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "定制插件，指定插件名和自定制字符串，使用逗号分隔。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "列出全部已装插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "启用该名称插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "禁用该名称插件"
 
@@ -733,69 +729,81 @@ msgstr "逗号间隔的电子书发送到设备目录的列表。将使用第一
 msgid "Communicate with S60 phones."
 msgstr "与 S60 手机通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "在 iTune/iBooks 中将“系列”作为“分类”"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "缓存来自 iTunes/iBooks 的封面"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple 设备"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "与 iTunes/iBooks 通信"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "检测到 Apple 设备，正在启动 iTunes，请稍候..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr "无法直接从 iDevice 复制书籍。请把书籍先从 iTunes 中拖到桌面，再把它们加入 calibre 的书库。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "更新设备元数据列表..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "第 %d/%d 个"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "完成"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -805,7 +813,7 @@ msgstr ""
 "请用 iBooks 软件删除它们。\n"
 "点击“详细信息”查看列表。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -813,31 +821,31 @@ msgstr ""
 "无法转换部分封面图像。\n"
 "点击“详细信息”查看列表。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "新闻"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "分类"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "与 iTunes 通信。"
 
@@ -883,20 +891,20 @@ msgstr "锦书"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "从设备中获取书籍列表..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "传输书籍到设备中..."
 
@@ -904,8 +912,8 @@ msgstr "传输书籍到设备中..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "将书籍添加到设备的元数据列表中..."
 
@@ -915,8 +923,8 @@ msgstr "将书籍添加到设备的元数据列表中..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "正在从设备中删除书籍..."
 
@@ -924,17 +932,17 @@ msgstr "正在从设备中删除书籍..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "将书籍从设备的元数据列表移除中..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "正在传输元数据到设备..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "未安装锦书 SDK。"
 
@@ -1233,32 +1241,32 @@ msgstr "与 Sony PRS-500 电子书阅读器通信。"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "与 Sony 电子书阅读器通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "按标题"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "按作者"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr "逗号间隔的元数据域列表，用以在设备形成合集。可能性包括： "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr "。有两种特别合集： %s:%s 和 %s:%s。将这些值添加到列表以启用。合集将被 \":\" 后字符命名。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1267,29 +1275,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1422,7 +1441,7 @@ msgstr "附加定制"
 msgid "Communicate with an eBook reader."
 msgstr "与电子书阅读器通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "获取设备信息..."
 
@@ -2097,7 +2116,7 @@ msgstr "将输入转换为HTML中..."
 msgid "Running transforms on ebook..."
 msgstr "正在对电子书籍进行转换..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "正在创建"
 
@@ -2229,7 +2248,7 @@ msgstr "开始"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "不要在书籍头部插入目录."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2242,6 +2261,10 @@ msgstr ""
 "指定元素分节。\"无\" 则整书为一节。\"文件\" "
 "则一文件为一节；若有文体使用此项。\"目录\"则按照目录结构分节；若失败，调整\"结构检测\"和/或\"目录\"设定(打开\"强制使用自动生成目录\")。"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2613,105 +2636,105 @@ msgstr "从归档文件(zip/rar)解压一般电子书格式。同时试图自动
 msgid "TEMPLATE ERROR"
 msgstr "模板错误"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "否"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "是"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "标题"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "作者"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "出版商"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "出品人"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "注释"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "标签"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "系列"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "语言"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "时间戳"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "发布于"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "权限"
 
@@ -3128,7 +3151,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3261,7 +3284,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML 目录生成选项。"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3449,6 +3472,7 @@ msgid "Author"
 msgstr "作者"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "主题"
 
@@ -3740,135 +3764,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "默认将文件传输到存储卡而非设备内置存储"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "删除前确认"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "主窗口位置尺寸"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "新版程序可用时提示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "使用罗马数字作为序列数字"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "以名称，流行度，或星级来为标签排序。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "在浏览模式下显示的书籍封面数量"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "转换到LRF文件的默认选项"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "查看LRF文件的选项"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "使用内置浏览器查看的文件格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "显示书籍列表时显示的信息列"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "在程序启动时启动内容服务程序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "在数据库中保留旧消息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "显示系统托盘图标"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "将下载的新闻传输到设备上"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "书籍传输到设备后从书库中自动删除"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "将封面显示在单独的窗口而不是在 Calibre 主窗口"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "禁用系统托盘消息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "当“传送到设备”按钮被按下时的默认操作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "等待中的工作进程最大数量"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "下载社会性元数据(标签、评分等)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "使用新元数据覆盖作者和书名信息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "自动下载可用封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "将并发任务最大值限制为 CPU 数量"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "用户界面的版式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "在标签浏览器中显示每个项目说明的平均星级"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "禁用界面动画"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "标签浏览器分类无法显示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "选择文件"
 
@@ -4076,8 +4104,8 @@ msgstr "仅使用主书库生成注释"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "未选择书籍"
@@ -4274,7 +4302,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4340,7 +4368,7 @@ msgid "Bulk convert"
 msgstr "批量转换"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "无法转换"
 
@@ -4348,7 +4376,7 @@ msgstr "无法转换"
 msgid "Starting conversion of %d book(s)"
 msgstr "开始转换 %d 本书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4529,7 +4557,7 @@ msgid "Stop Content Server"
 msgstr "停止连接服务"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "发送邮件至"
 
@@ -4537,32 +4565,32 @@ msgstr "发送邮件至"
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "设置基于email的书籍共享"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "发送到设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "连接/共享"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4649,26 +4677,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "无法编辑元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "无法合并书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "合并需要选定至少两本书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4676,7 +4704,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4688,7 +4716,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4699,19 +4727,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "抓取新闻"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "正在抓取新闻，来源于 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " 已抓取。"
 
@@ -4776,7 +4804,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "运行欢迎向导"
 
@@ -5018,7 +5046,7 @@ msgid "The specified directory could not be processed."
 msgstr "无法处理指定目录。"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "没有书籍"
 
@@ -5224,8 +5252,8 @@ msgstr "每个文件夹中放多本书籍，假定个电子书文件是不同的
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "路径"
 
@@ -5235,17 +5263,17 @@ msgstr "路径"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "格式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "合集"
 
@@ -5255,25 +5283,25 @@ msgid "Click to open"
 msgstr "点击打开"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "无"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5331,7 +5359,7 @@ msgstr "输出"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5354,14 +5382,14 @@ msgstr "输出"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5932,10 +5960,14 @@ msgstr "不要在书籍开始插入目录(&T)。"
 msgid "FB2 Output"
 msgstr "FB2 输出"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr "分节："
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "字体缩放向导"
@@ -6527,7 +6559,7 @@ msgid "Regex:"
 msgstr "正则表达式："
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "测试"
 
@@ -7122,97 +7154,97 @@ msgstr "错误"
 msgid "Error communicating with device"
 msgstr "与设备通信发生错误"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "无合适格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "选择一个将做为设备打开的文件夹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "设备通讯错误。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "设备： "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " 被检测到。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "选择传送"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "选择传送到设备的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "无设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "无法传送：无连接设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "无卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "无法传送：设备中无储存卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "上传到设备之前自动转换如下书籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "正在发送分类到设备。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "将新闻传送到设备."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "传送书籍到设备。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "设备存储空间不足"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>由于设备存储空间不足无法将书籍传送到设备上 "
@@ -7498,7 +7530,7 @@ msgstr "选择格式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "格式"
 
@@ -7634,7 +7666,7 @@ msgstr "&OK"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "取消(&C)"
 
@@ -7681,8 +7713,8 @@ msgid "Location"
 msgstr "位置"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7714,12 +7746,12 @@ msgid "Author sort"
 msgstr "按作者排序"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "无效的作者名"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "作者名中不能包含&符号"
 
@@ -7905,22 +7937,22 @@ msgid "Working"
 msgstr "执行中"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "小写"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "大写"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "标题大写"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "大写"
 
@@ -9404,12 +9436,12 @@ msgid "%s (was %s)"
 msgstr "%s(曾为 %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "项目为空"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "项目不能设置为什么也没有。请删除之。"
 
@@ -9478,7 +9510,7 @@ msgid "Send test mail from %s to:"
 msgstr "发送测试邮件，从 %s 至："
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "测试(&T)"
 
@@ -9723,61 +9755,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "电子邮件发送 %s 到 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "新闻:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "电子书："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "已添加, 您可以从中获取电子书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "由"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "使用 %s 格式."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "正在发送邮件至"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "在发送电子邮件之前自动转换下列书籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "由于无法找到合适的文件格式无法通过电子邮件发送下列书籍:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "无法通过电子邮件发送书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "已发送"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "将新闻发送到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9791,67 +9823,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "正则表达式(&E)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "文件名(&N)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "标题："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "正则表达式 (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "无匹配"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "作者:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "正则表达式 (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "系列："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "正则表达式 (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "系列索引："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "正则表达式 (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "正则表达式 (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "封面浏览器"
@@ -10059,48 +10109,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "编辑细节"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "在设备上"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "大小 (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "书籍 %s/%s。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "此书 UUID 为 \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "在书库中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "大小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "为删除作的标记"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "双击<b>编辑</b>该项<br><br>"
 
@@ -10175,7 +10225,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>无结果项</b> 匹配关键词 <i>%s</i>。"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "无匹配项"
 
@@ -10192,12 +10242,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF 查看程序工具栏"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "下一页"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "上一页"
 
@@ -11009,25 +11059,32 @@ msgstr "设为默认(&d)"
 msgid "&Remove email"
 msgstr "删除邮件地址(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "自动发送"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "电子邮件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "电子邮件中使用的格式. 首先匹配的格式将被使用."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr "如选中, 下载的新闻奖自动被发送到 <br>该邮件地址 (使用列出的支持格式之一)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "新邮件地址"
 
@@ -11039,91 +11096,91 @@ msgstr "窄"
 msgid "Wide"
 msgstr "宽"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "大"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "总是"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "自动"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "从不"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "首字母"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "已禁用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "已分区"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "用户界面风格(&L)(须重启生效):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "浏览模式下显示的书籍封面数量(&N), 须重启生效:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "选择界面语言, 需重启(&L):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "在标签浏览器中显示平均评分(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr "禁用所有的动画效果。有助于提高在老旧电脑上的运行速度。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "禁用动画效果(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "显示系统托盘图标, 需重启生效(&t)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "启动时显示软件启动画面(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "禁用系统托盘提示(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "使用罗马数字作为序列数字"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "在单独的窗口显示封面浏览界面, 需重启生效(&b)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11132,22 +11189,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11157,64 +11214,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "工具栏(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "图标大小(&I):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "在图标下显示文本(&T):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "把工具栏分割成两栏(&S)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "界面字体："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "改变字体(&F)(需要重启)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "应用(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "恢复默认值(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "保存改动"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "取消并返回到上一页"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "恢复默认不支持"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr "您所做的改动要求立即重启calibre。在重启之前，您不能再做其它任何设置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "需要重启"
@@ -11956,30 +12009,34 @@ msgid "The main toolbar"
 msgstr "主工具栏"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "连接设备后的主工具栏"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "calibre 书库书籍的语境菜单"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "设备上书籍的语境菜单"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "无法添加"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "无法移除"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "此处无法移除 %s 操作"
 
@@ -12076,7 +12133,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "搜索"
@@ -12169,166 +12226,166 @@ msgstr "单击改变"
 msgid "&Alternate shortcut:"
 msgstr "其它快捷键(&A)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "隐藏分类 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "显示分类"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "管理%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "管理已存搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "管理用户分类"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "显示所有分类"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "复制搜索名称"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "已存搜索名 %s 被占用。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "在标签浏览中搜索项目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12338,60 +12395,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "搜索(&I)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "搜索首个/下一匹配项"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "收缩所有分类"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "按名字排序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "按欢迎度排序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "按平均评分排序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "设置标签浏览器中内容的排序规则"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "匹配所有"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "匹配任一"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "管理用户分类(&U)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "把你自定义的分类添加到标签浏览器"
 
@@ -12464,23 +12521,23 @@ msgid ""
 "automatically."
 msgstr "您以调试模式启动 calibre。退出程序后，Log 文件将存在文件：%s<p> Log 将自动显示。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "转换错误"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "清单禁用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>失败</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "仍有任务运行。您是否希望退出？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -12490,11 +12547,11 @@ msgstr ""
 "                      退出可能导致设备损坏。<br>\n"
 "                      确定退出么？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12696,7 +12753,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "定制电子书查看器的选项"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "记住上次使用窗口大小"
 
@@ -12774,36 +12831,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "词典查询(&L)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "转到..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "下一节"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "上一节"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "文档起始"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "文档结尾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "节起始"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "节末尾"
 
@@ -12879,73 +12936,73 @@ msgstr "打印预览"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "正在连接 dict.org 查询：<b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "选择电子书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "电子书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "未找到 %s 的匹配"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "正在加载流..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "正在排布流 %s..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "书签#%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "添加书签"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "编辑书签标题："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "管理书签"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "正在加载电子书..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "无法打开电子书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "电子书查看器控制选项"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr "若指定，查看器窗口在打开时将试图转到前面。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr "若选定，查看窗口开启时试图全屏。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "在控制台显示 javascript 警告以及控制台信息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13023,27 +13080,27 @@ msgstr "找到前一项"
 msgid "Print eBook"
 msgstr "打印电子书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "大小写转换"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "转换大小写"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "拖拽以调整大小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "显示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "隐藏"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "触发器"
 
@@ -14276,11 +14333,11 @@ msgstr ""
 "\n"
 "具体命令帮助：%%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "没有提供标签"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14294,15 +14351,15 @@ msgstr "%s的平均星级是%3.1f"
 msgid "Main"
 msgstr "主"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>正在将旧数据库转移到位于 %s 的新数据库<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "正在复制<b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "正在压缩数据库"
 
@@ -15340,101 +15397,101 @@ msgstr "不从 calire 服务器下载最新订阅清单"
 msgid "Unknown News Source"
 msgstr "未知新闻来源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "订阅清单 “%s” 需要用户名与密码。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "下载完成"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "下载下列文章失败："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "下载下列文章的某些部分失败："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " 自 "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\t失败链接："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "正在抓取源..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "从索引页面获取了源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "正在尝试下载封面..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr "正在生成刊头..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "开始下载 [ %d 线程]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "新闻源下载到 %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "无法下载封面：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "正在从 %s 下载封面"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr "已下载刊头图像"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "无标题文章"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "已下载文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "下载失败文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "抓取源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -16329,9 +16386,6 @@ msgstr "不下载 CSS 样式表。"
 #~ msgid "Unknown destination profile %r"
 #~ msgstr "未知的目标配置文件 %r"
 
-#~ msgid "Toolbar"
-#~ msgstr "工具栏"
-
 #~ msgid "&Button size in toolbar"
 #~ msgstr "工具栏按钮大小(&B)"
 
@@ -17183,6 +17237,9 @@ msgstr "不下载 CSS 样式表。"
 #~ msgid "Format:"
 #~ msgstr "格式："
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "无有效插件位于 "
+
 #~ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 #~ msgstr "该配置文件适用 SONY PRS 产品线，如 500/505/700 等型号。"
 
@@ -18134,6 +18191,9 @@ msgstr "不下载 CSS 样式表。"
 #~ msgid "  "
 #~ msgstr "  "
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "自定义工具栏"
+
 #~ msgid "Communicate with the Booq Avant"
 #~ msgstr "与 Booq Avant 通信"
 
@@ -18152,6 +18212,9 @@ msgstr "不下载 CSS 样式表。"
 #~ "via Preferences->Advanced->Tweaks"
 #~ msgstr "把作者排序字段全部重置为跟据作者字段值自动生成的值。具体的生成规则可以在首选项->高级->优化调整中配置"
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "把工具栏分割成两栏(&S)"
+
 #~ msgid "Downloads series/tags/rating information from librarything.com"
 #~ msgstr "从librarything.com下载系列、标签、星级信息。"
 
diff --git a/src/calibre/translations/zh_HK.po b/src/calibre/translations/zh_HK.po
index f5a05ff858..102d3a8b2e 100644
--- a/src/calibre/translations/zh_HK.po
+++ b/src/calibre/translations/zh_HK.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2009-09-05 19:14+0000\n"
 "Last-Translator: pikoman <twcheang@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@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: 2011-03-27 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:53+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "不要做任何事情"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -32,7 +32,7 @@ msgstr "不要做任何事情"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -49,9 +49,9 @@ msgstr "不要做任何事情"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -71,7 +71,7 @@ msgstr "不要做任何事情"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -117,19 +117,19 @@ msgstr "不要做任何事情"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -137,12 +137,12 @@ msgstr "不要做任何事情"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -153,11 +153,11 @@ msgstr "不要做任何事情"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -171,46 +171,46 @@ msgstr "不要做任何事情"
 msgid "Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "文件類型"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "讀取Metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "編寫Metadata"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr ""
@@ -325,7 +325,7 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
+msgid "Toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
@@ -335,7 +335,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
+msgid "Searching"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
@@ -644,35 +644,31 @@ msgstr ""
 msgid "This profile is intended for the Sanda Bambook."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "安裝plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -680,29 +676,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -724,106 +720,118 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
-msgid "Use Series as Category in iTunes/iBooks"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
-msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
-msgid "Cache covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
-msgid "Enable to cache and display covers from iTunes/iBooks"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
-msgid "Apple device"
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
+msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
+msgid "Cache covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
+msgid "Enable to cache and display covers from iTunes/iBooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
+msgid "Apple device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -867,20 +875,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -888,8 +896,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
@@ -899,8 +907,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr ""
 
@@ -908,17 +916,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr ""
 
@@ -1217,32 +1225,32 @@ msgstr ""
 msgid "Communicate with all the Sony eBook readers."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1251,29 +1259,40 @@ msgid ""
 "950 and newer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1406,7 +1425,7 @@ msgstr ""
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr ""
 
@@ -2043,7 +2062,7 @@ msgstr ""
 msgid "Running transforms on ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr ""
 
@@ -2158,7 +2177,7 @@ msgstr ""
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2169,6 +2188,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2518,105 +2541,105 @@ msgstr ""
 msgid "TEMPLATE ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr ""
 
@@ -2999,7 +3022,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr ""
 
@@ -3132,7 +3155,7 @@ msgid "HTML TOC generation options."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3298,6 +3321,7 @@ msgid "Author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr ""
 
@@ -3562,135 +3586,139 @@ msgid ""
 "are always removed with plain text output."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 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:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr ""
 
@@ -3898,8 +3926,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr ""
@@ -4096,7 +4124,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4162,7 +4190,7 @@ msgid "Bulk convert"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr ""
 
@@ -4170,7 +4198,7 @@ msgstr ""
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr ""
 
@@ -4351,7 +4379,7 @@ msgid "Stop Content Server"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr ""
 
@@ -4359,32 +4387,32 @@ msgstr ""
 msgid "Email to and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr ""
@@ -4471,26 +4499,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4498,7 +4526,7 @@ msgid ""
 "changed.<br><br>Please confirm you want to proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4510,7 +4538,7 @@ msgid ""
 "calibre library.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4521,19 +4549,19 @@ msgid ""
 "Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr ""
 
@@ -4598,7 +4626,7 @@ msgid "Ctrl+P"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr ""
 
@@ -4840,7 +4868,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -5042,8 +5070,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr ""
 
@@ -5053,17 +5081,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr ""
 
@@ -5073,25 +5101,25 @@ msgid "Click to open"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr ""
 
@@ -5149,7 +5177,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5172,14 +5200,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5744,10 +5772,14 @@ msgstr ""
 msgid "FB2 Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr ""
@@ -6339,7 +6371,7 @@ msgid "Regex:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr ""
 
@@ -6924,97 +6956,97 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -7300,7 +7332,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr ""
 
@@ -7436,7 +7468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr ""
 
@@ -7483,8 +7515,8 @@ msgid "Location"
 msgstr ""
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7516,12 +7548,12 @@ msgid "Author sort"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr ""
 
@@ -7705,22 +7737,22 @@ msgid "Working"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr ""
 
@@ -9200,12 +9232,12 @@ msgid "%s (was %s)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr ""
 
@@ -9274,7 +9306,7 @@ msgid "Send test mail from %s to:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr ""
 
@@ -9509,61 +9541,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9577,67 +9609,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr ""
@@ -9845,48 +9895,48 @@ msgstr ""
 msgid "Edit template"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -9961,7 +10011,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr ""
 
@@ -9978,12 +10028,12 @@ msgid "LRF Viewer toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr ""
 
@@ -10789,25 +10839,32 @@ msgstr ""
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr ""
 
@@ -10819,91 +10876,91 @@ msgstr ""
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -10912,22 +10969,22 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
 "value is ignored."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -10937,64 +10994,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr ""
@@ -11725,30 +11778,34 @@ msgid "The main toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
-msgid "The main toolbar when a device is connected"
+msgid "The optional second toolbar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+msgid "The main toolbar when a device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr ""
 
@@ -11845,7 +11902,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr ""
@@ -11938,166 +11995,166 @@ msgstr ""
 msgid "&Alternate shortcut:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12107,60 +12164,60 @@ msgid ""
 "containing the text \"foo\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr ""
 
@@ -12233,34 +12290,34 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12460,7 +12517,7 @@ msgid "Options to customize the ebook viewer"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr ""
 
@@ -12538,36 +12595,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr ""
 
@@ -12643,73 +12700,73 @@ msgstr ""
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
-msgid ""
-"If specified, viewer window will try to come to the front when started."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
+"If specified, viewer window will try to come to the front when started."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -12784,27 +12841,27 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr ""
 
@@ -13970,11 +14027,11 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -13988,15 +14045,15 @@ msgstr ""
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr ""
 
@@ -15033,101 +15090,101 @@ msgstr ""
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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_TW.po b/src/calibre/translations/zh_TW.po
index 0f49c1083b..837a87069b 100644
--- a/src/calibre/translations/zh_TW.po
+++ b/src/calibre/translations/zh_TW.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-26 02:12+0000\n"
+"POT-Creation-Date: 2011-04-01 19:21+0000\n"
 "PO-Revision-Date: 2011-03-18 03:16+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: 2011-03-27 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-04-02 04:54+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "Language: zh_TW\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
 msgid "Does absolutely nothing"
 msgstr "完全不做任何事"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -33,7 +33,7 @@ msgstr "完全不做任何事"
 #: /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:660
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467
 #: /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/metadata.py:56
@@ -50,9 +50,9 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /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:54
@@ -72,7 +72,7 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23
@@ -118,19 +118,19 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
@@ -138,12 +138,12 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185
@@ -154,11 +154,11 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:495
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159
@@ -172,46 +172,46 @@ msgstr "完全不做任何事"
 msgid "Unknown"
 msgstr "未知"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77
 msgid "Base"
 msgstr "基本"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "Customize"
 msgstr "自訂"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47
 msgid "Cannot configure"
 msgstr "不能設定"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318
 msgid "File type"
 msgstr "檔案類型"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354
 msgid "Metadata reader"
 msgstr "元數據讀取器"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384
 msgid "Metadata writer"
 msgstr "元數據寫入器"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414
 msgid "Catalog generator"
 msgstr "分類產生器"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523
 msgid "User Interface Action"
 msgstr "使用者介面動作"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Preferences"
 msgstr "偏好設定"
@@ -330,8 +330,8 @@ msgid "Add/remove your own columns to the calibre book list"
 msgstr "在 calibre 書籍清單中加入/移除您自己的欄位"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856
-msgid "Customize the toolbar"
-msgstr "自訂工具列"
+msgid "Toolbar"
+msgstr "工具列"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862
 msgid ""
@@ -340,8 +340,8 @@ msgid ""
 msgstr "自訂工具列和關聯選單，改變每次可用的動作"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868
-msgid "Customize searching"
-msgstr "自訂搜尋"
+msgid "Searching"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874
 msgid "Customize the way searching for books works in calibre"
@@ -649,35 +649,31 @@ msgstr "這個設定檔適用於 B&N Nook Color。"
 msgid "This profile is intended for the Sanda Bambook."
 msgstr "這個設定檔適用於 Sanda Bambook。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26
 msgid "Installed plugins"
 msgstr "已安裝的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27
 msgid "Mapping for filetype plugins"
 msgstr "檔案類型外掛程式對應"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Local plugin customization"
 msgstr "本地外掛程式自訂設置"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Disabled plugins"
 msgstr "已關閉的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Enabled plugins"
 msgstr "已啟用外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94
-msgid "No valid plugin found in "
-msgstr "沒有在 中找到合適的外掛程式 "
-
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid ""
 "    %prog options\n"
 "\n"
@@ -689,29 +685,29 @@ msgstr ""
 "    以載入的外部外掛程式自訂 calibre。\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 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:562
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "依名稱移除一個自訂的外掛程式。對內建外掛程式無效"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "自訂外掛程式。指定外掛程式的名稱以及用逗號分隔的自訂字串。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521
 msgid "List all installed plugins"
 msgstr "列出所有已安裝的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523
 msgid "Enable the named plugin"
 msgstr "開啟已經命名的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525
 msgid "Disable the named plugin"
 msgstr "關閉已經命名的外掛程式"
 
@@ -733,69 +729,81 @@ msgstr "要將電子書傳送至裝置的目錄清單，以逗號分隔。會使
 msgid "Communicate with S60 phones."
 msgstr "與 S60 電話連接。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47
+msgid ""
+"<p>If you do not want calibre to recognize your Apple iDevice when it is "
+"connected to your computer, click <b>Disable Apple Driver</b>.</p><p>To "
+"transfer books to your iDevice, click <b>Disable Apple Driver</b>, then use "
+"the 'Connect to iTunes' method recommended in the <a "
+"href=\"http://www.mobileread.com/forums/showthread.php?t=118559\">Calibre + "
+"iDevices FAQ</a>, using the <em>Connect/Share</em>|<em>Connect to "
+"iTunes</em> menu item.</p><p>Enabling the Apple driver for direct connection "
+"to iDevices is an unsupported advanced user mode.</p><p></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65
+msgid "Disable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69
+msgid "Enable Apple driver"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
 msgid "Use Series as Category in iTunes/iBooks"
 msgstr "以系列做為 iTunes/iBooks 中的分類"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118
 msgid "Enable to use the series name as the iTunes Genre, iBooks Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120
 msgid "Cache covers from iTunes/iBooks"
 msgstr "快取 iTunes/iBooks 封面"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122
 msgid "Enable to cache and display covers from iTunes/iBooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58
-msgid "Skip 'Connect to iTunes' recommendation"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60
-msgid "Enable to skip the 'Connect to iTunes' recommendation dialog"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176
 msgid "Apple device"
 msgstr "Apple device"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178
 msgid "Communicate with iTunes/iBooks."
 msgstr "與 iTunes/iBooks 閱讀器連接。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr "偵測到 Apple 裝置，執行 iTunes，請稍候 ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192
 msgid ""
 "Cannot copy books directly from iDevice. Drag from iTunes Library to "
 "desktop, then add to calibre's Library window."
 msgstr "不能直接從 iDevice 複製書籍。請從 iTunes Library 拖曳到桌面，然後加入 calibre 的書庫視窗。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355
 msgid "Updating device metadata listing..."
 msgstr "正在更新裝置元數據清單..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114
 msgid "finished"
 msgstr "已完成"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
@@ -805,7 +813,7 @@ msgstr ""
 "可能已使用 iBooks 程式刪除了。\n"
 "點選「顯示詳細資料」來查看清單。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
@@ -813,31 +821,31 @@ msgstr ""
 "某些封面圖片無法轉換。\n"
 "點選「顯示詳細資料」來查看清單。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159
 msgid "News"
 msgstr "新聞"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734
 msgid "Catalog"
 msgstr "分類"
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972
 msgid "Communicate with iTunes."
 msgstr "與 iTunes 連接。"
 
@@ -883,20 +891,20 @@ msgstr "Bambook"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226
 msgid "Getting list of books on device..."
 msgstr "從裝置中取得書籍列表"
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257
 msgid "Transferring books to device..."
 msgstr "正在傳送書籍到裝置中..."
 
@@ -904,8 +912,8 @@ msgstr "正在傳送書籍到裝置中..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
 msgid "Adding books to device metadata listing..."
 msgstr "將書籍加入裝置的元數據清單..."
 
@@ -915,8 +923,8 @@ msgstr "將書籍加入裝置的元數據清單..."
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
 msgid "Removing books from device..."
 msgstr "正在從裝置中移除書籍..."
 
@@ -924,17 +932,17 @@ msgstr "正在從裝置中移除書籍..."
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346
 msgid "Removing books from device metadata listing..."
 msgstr "將書籍從裝置的元數據清單移除..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376
 msgid "Sending metadata to device..."
 msgstr "正在傳送元數據到裝置..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129
 msgid "Bambook SDK has not been installed."
 msgstr "Bambook SDK 尚未安裝。"
 
@@ -1236,32 +1244,32 @@ msgstr "與 Sony PRS-500 eBook 閱讀器連接。"
 msgid "Communicate with all the Sony eBook readers."
 msgstr "與所有的 Sony eBook 閱讀器連接。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
 msgid "All by title"
 msgstr "全部依書名"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63
 msgid "All by author"
 msgstr "全部依作者"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr "要轉換到裝置上收藏的元數據欄位清單(以逗號分隔)。可用的數值包含： "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69
 msgid ""
 ". Two special collections are available: %s:%s and %s:%s. Add  these values "
 "to the list to enable them. The collections will be given the name provided "
 "after the \":\" character."
 msgstr "。有兩個特殊藏書可用：%s：%s 和 %s：%s。將這些數值加入清單可啟用它們。這些藏書會以章節加上「:」來命名。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
 msgid "Upload separate cover thumbnails for books (newer readers)"
 msgstr "分開上傳書籍的封面縮圖（新閱讀者）"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74
 msgid ""
 "Normally, the SONY readers get the cover image from the ebook file itself. "
 "With this option, calibre will send a separate cover image to the reader, "
@@ -1272,29 +1280,40 @@ msgstr ""
 "通常，SONY 閱讀器會從電子書檔案本身取得封面圖片。使用這個選項，calibre 會傳送分離的封面圖片到閱讀器，如果您傳送的是不能變更封面具 DRM "
 "保護的電子書時會很有用。警告：這個選項只能用於較新的 SONY 閱讀器：350, 650, 950 或往後機種。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
 msgid ""
 "Refresh separate covers when using automatic management (newer readers)"
 msgstr "使用自動管理時重新整理個別封面 (新聞閱讀器)"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82
 msgid ""
 "Set this option to have separate book covers uploaded every time you connect "
 "your device. Unset this option if you have so many books on the reader that "
 "performance is unacceptable."
 msgstr "設定這個選項會在您每一次連接裝置時上傳分離的書籍封面。如果您在閱讀器上有太多書籍以致影響效能時請取消這個選項。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
 msgid "Preserve cover aspect ratio when building thumbnails"
 msgstr "建立縮圖時保持封面的長寬比"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
 msgid ""
 "Set this option if you want the cover thumbnails to have the same aspect "
 "ratio (width to height) as the cover. Unset it if you want the thumbnail to "
 "be the maximum size, ignoring aspect ratio."
 msgstr "如果您想要封面縮圖保持與封面相同的長寬比（寬度與高度），請設定這個選項。如果您想要縮圖有最大的尺寸，忽略長寬比，請不要設定它。"
 
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+msgid "Search for books in all folders"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94
+msgid ""
+"Setting this option tells calibre to look for books in all folders on the "
+"device and its cards. This permits calibre to find books put on the device "
+"by other software and by wireless download."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69
 msgid "Unnamed"
@@ -1427,7 +1446,7 @@ msgstr "額外自訂項目"
 msgid "Communicate with an eBook reader."
 msgstr "與 eBook 閱讀器連接。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94
 msgid "Get device information..."
 msgstr "取得裝置資訊..."
 
@@ -2102,7 +2121,7 @@ msgstr "將輸入轉換為HTML格式..."
 msgid "Running transforms on ebook..."
 msgstr "正在對電子書籍進行轉換..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032
 msgid "Creating"
 msgstr "正在建立"
 
@@ -2232,7 +2251,7 @@ msgstr "開始"
 msgid "Do not insert a Table of Contents at the beginning of the book."
 msgstr "不要在書籍開始的地方插入目錄."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149
 msgid ""
 "Specify the sectionization of elements. A value of \"nothing\" turns the "
 "book into a single section. A value of \"files\" turns each file into a "
@@ -2243,6 +2262,10 @@ msgid ""
 "of Contents)."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159
+msgid "for a complete list with descriptions."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
@@ -2607,105 +2630,105 @@ msgstr "從壓縮檔 (zip/rar) 中解壓縮一般電子書格式。同時也自
 msgid "TEMPLATE ERROR"
 msgstr "範本錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "No"
 msgstr "否"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561
 msgid "Yes"
 msgstr "是"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128
 #: /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:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574
 msgid "Title"
 msgstr "書名"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019
 msgid "Author(s)"
 msgstr "作者"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Publisher"
 msgstr "出版社"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr "製作人"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211
 msgid "Comments"
 msgstr "評論"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761
 msgid "Tags"
 msgstr "標籤"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114
 msgid "Series"
 msgstr "系列"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
 msgid "Language"
 msgstr "語言"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194
 msgid "Timestamp"
 msgstr "時間戳記"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271
 msgid "Published"
 msgstr "發佈於"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690
 msgid "Rights"
 msgstr "所有權"
 
@@ -3113,7 +3136,7 @@ msgstr ""
 msgid "Amazon timed out. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94
 msgid "Metadata source"
 msgstr "元數據來源"
 
@@ -3247,7 +3270,7 @@ msgid "HTML TOC generation options."
 msgstr "HTML 目錄頁產生選項。"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759
 msgid "Rating"
@@ -3435,6 +3458,7 @@ msgid "Author"
 msgstr "作者"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Subject"
 msgstr "主旨"
 
@@ -3741,135 +3765,139 @@ msgid ""
 msgstr ""
 "不要移除文件中的圖片參照。這只有在和 txt-output-formatting 選項配合使用時會有用，因為連結在純文字輸出時都是會被移除的。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72
 msgid "Send file to storage card instead of main memory by default"
 msgstr "預設傳送檔案到記憶卡而非主記憶體"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74
 msgid "Confirm before deleting"
 msgstr "刪除前確認"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76
 msgid "Main window geometry"
 msgstr "主視窗位置大小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78
 msgid "Notify when a new version is available"
 msgstr "當有新版本可用時通知"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80
 msgid "Use Roman numerals for series number"
 msgstr "在系列編號中使用羅馬數字"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82
 msgid "Sort tags list by name, popularity, or rating"
 msgstr "依名稱、熱門程度或評等排序標籤清單"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84
+msgid "Match tags by any or all."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "在封面瀏覽模式中要顯示的封面數量"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88
 msgid "Defaults for conversion to LRF"
 msgstr "轉換為 LRF 的預設值"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
 msgid "Options for the LRF ebook viewer"
 msgstr "LRF 電子書檢視器的選項"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Formats that are viewed using the internal viewer"
 msgstr "使用內部檢視器觀看的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Columns to be displayed in the book list"
 msgstr "在書籍清單中顯示的欄位"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96
 msgid "Automatically launch content server on application startup"
 msgstr "應用程式啟動時自動執行內容伺服器"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Oldest news kept in database"
 msgstr "保留在資料庫中最舊的新聞"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98
 msgid "Show system tray icon"
 msgstr "顯示系統匣圖示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100
 msgid "Upload downloaded news to device"
 msgstr "將下載的新聞上傳到裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102
 msgid "Delete books from library after uploading to device"
 msgstr "上傳到裝置後刪除書庫中的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr "在個別視窗中顯示 cover flow 而非在主 calibre 視窗中顯示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106
 msgid "Disable notifications from the system tray icon"
 msgstr "停用系統匣圖示的通知"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108
 msgid "Default action to perform when send to device button is clicked"
 msgstr "當按下「傳送到裝置」按鈕時的預設動作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
 msgid ""
 "Start searching as you type. If this is disabled then search will only take "
 "place when the Enter or Return key is pressed."
 msgstr "輸入時即開始搜尋。如果停用此項，搜尋只有在按下 Enter 或 Return 鍵後才會開始。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116
 msgid ""
 "When searching, show all books with search results highlighted instead of "
 "showing only the matches. You can use the N or F3 keys to go to the next "
 "match."
 msgstr "搜尋時，將搜尋結果在所有書籍中以強調方式顯示，而不是只顯示符合項。您可以使用 N 或 F3 鍵移至下一個符合項。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134
 msgid "Maximum number of waiting worker processes"
 msgstr "等待 worker 程序的最大數目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr "下載社交網路元數據（標籤/評等/其他）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138
 msgid "Overwrite author and title with new metadata"
 msgstr "以新的元數據覆蓋作者和書名"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101
 msgid "Automatically download the cover, if available"
 msgstr "自動下載封面，如果有的話"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr "限制最大同時工作不超過的 CPU 數目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144
 msgid "The layout of the user interface"
 msgstr "使用者介面的配置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146
 msgid "Show the average rating per item indication in the tag browser"
 msgstr "在標籤瀏覽器中顯示每個項目的平均評等指示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148
 msgid "Disable UI animations"
 msgstr "停用 UI 動畫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153
 msgid "tag browser categories not to display"
 msgstr "標籤瀏覽器不顯示的分類"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423
 msgid "Choose Files"
 msgstr "選擇檔案"
 
@@ -4077,8 +4105,8 @@ msgstr "使用者註記只從主要書庫產生"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92
 msgid "No books selected"
 msgstr "尚未選取書籍"
@@ -4275,7 +4303,7 @@ msgstr "在您的 calibre 書庫資料庫中找不到錯誤。您想要檢查書
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186
@@ -4341,7 +4369,7 @@ msgid "Bulk convert"
 msgstr "大量轉換"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517
 msgid "Cannot convert"
 msgstr "不能轉換"
 
@@ -4349,7 +4377,7 @@ msgstr "不能轉換"
 msgid "Starting conversion of %d book(s)"
 msgstr "正在開始 %d 本書的轉換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171
 msgid "Empty output file, probably the conversion process crashed"
 msgstr "空的輸出檔案，可能是轉換程序當機了"
 
@@ -4530,7 +4558,7 @@ msgid "Stop Content Server"
 msgstr "停止內容伺服器"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96
 msgid "Email to"
 msgstr "寄電子郵件到"
 
@@ -4538,32 +4566,32 @@ msgstr "寄電子郵件到"
 msgid "Email to and delete from library"
 msgstr "以郵件寄出並從書庫刪除"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90
 msgid "(delete from library)"
 msgstr "(從書庫刪除)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105
 msgid "Setup email based sharing of books"
 msgstr "設定基於電子郵件的書籍分享"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "D"
 msgstr "D"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123
 msgid "Send to device"
 msgstr "傳送到裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142
 msgid "Connect/share"
 msgstr "連線/分享"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84
 msgid "Stopping"
 msgstr "停止"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85
 msgid "Stopping server, this could take upto a minute, please wait..."
 msgstr "正在停止伺服器，這可能要花上一分鐘，請稍候..."
@@ -4650,26 +4678,26 @@ msgid "Downloading {0} for {1} book(s)"
 msgstr "正在下載 {1} 本書的 {0}"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189
 msgid "Cannot edit metadata"
 msgstr "不能編輯元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229
 msgid "Cannot merge books"
 msgstr "不能合併書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230
 msgid "At least two books must be selected for merging"
 msgstr "合併至少要選擇兩本書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233
 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/edit_metadata.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241
 msgid ""
 "Book formats and metadata from the selected books will be added to the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be merged.<br><br> The "
@@ -4679,7 +4707,7 @@ msgstr ""
 "選取書籍的書籍格式與元數據會加入到<b>第一本選取的書籍</b> (%s)。ISBN "
 "將<i>不會</i>被合併。<br><br>第二本及以後選取的書籍不會被刪除或變更。<br><br>請確認您想要繼續。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253
 msgid ""
 "Book formats from the selected books will be merged into the <b>first "
 "selected book</b> (%s). Metadata in the first selected book will not be "
@@ -4695,7 +4723,7 @@ msgstr ""
 "<br>第一本選取書籍的所有格式都會被保留，而第二本以後選取的書籍中任何重複的格式都會被永遠自您的 calibre "
 "書庫<b>刪除</b>。<br><br>您<b>確定</b>要繼續嗎？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269
 msgid ""
 "Book formats and metadata from the selected books will be merged into the "
 "<b>first selected book</b> (%s). ISBN will <i>not</i> be "
@@ -4709,19 +4737,19 @@ msgstr ""
 "將<i>不會</i>被合併。<br><br>在合併之後，第二本以後選取的書籍都會被<b>刪除</b>。<br><br>第一本選取書籍的所有格式都會被保留，"
 "而第二本以後選取的書籍中任何重複的格式都會被永遠自您的 calibre 書庫<b>刪除</b>。<br><br>您<b>確定</b>要繼續嗎？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19
 msgid "Fetch news"
 msgstr "取回新聞"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54
 msgid "Fetching news from "
 msgstr "取回新聞於 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83
 msgid " fetched."
 msgstr " 已取回。"
 
@@ -4786,7 +4814,7 @@ msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206
 msgid "Run welcome wizard"
 msgstr "執行歡迎精靈"
 
@@ -5028,7 +5056,7 @@ msgid "The specified directory could not be processed."
 msgstr "指定的目錄無法處理。"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "沒有書籍"
 
@@ -5234,8 +5262,8 @@ msgstr "每個資料夾有多本書，在資料夾中的每個電子書檔案都
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192
 msgid "Path"
 msgstr "路徑"
 
@@ -5245,17 +5273,17 @@ msgstr "路徑"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
 msgid "Formats"
 msgstr "格式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195
 msgid "Collections"
 msgstr "藏書"
 
@@ -5265,25 +5293,25 @@ msgid "Click to open"
 msgstr "按一下來開啟"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350
 msgid "None"
 msgstr "沒有"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243
 msgid "Paste Cover"
 msgstr "貼上封面"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244
 msgid "Copy Cover"
 msgstr "複製封面"
 
@@ -5341,7 +5369,7 @@ msgstr "輸出"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120
@@ -5364,14 +5392,14 @@ msgstr "輸出"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86
@@ -5951,10 +5979,14 @@ msgstr "不要在書籍的開頭插入目錄頁(&T)"
 msgid "FB2 Output"
 msgstr "FB2 輸出"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45
 msgid "Sectionize:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46
+msgid "Genre"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 msgid "Font rescaling wizard"
 msgstr "字型縮放精靈"
@@ -6557,7 +6589,7 @@ msgid "Regex:"
 msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
 msgid "Test"
 msgstr "測試"
 
@@ -7156,97 +7188,97 @@ msgstr "錯誤"
 msgid "Error communicating with device"
 msgstr "與裝置連線時發生錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307
 msgid "No suitable formats"
 msgstr "沒有合適的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647
 msgid "Select folder to open as device"
 msgstr "選擇資料夾開啟為裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698
 msgid "Error talking to device"
 msgstr "與裝置連繫時發生錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
 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:739
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742
 msgid "Device: "
 msgstr "裝置： "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744
 msgid " detected."
 msgstr " 被偵測到。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "選擇要傳送的項目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 msgid "%i of %i Books"
 msgstr "%i / %i 本書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "0 of %i Books"
 msgstr "0 / %i 本書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Choose format to send to device"
 msgstr "選擇要傳送到裝置的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
 msgid "No device"
 msgstr "沒有裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
 msgid "Cannot send: No device is connected"
 msgstr "不能傳送：沒有連線中的裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881
 msgid "No card"
 msgstr "沒有記憶卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882
 msgid "Cannot send: Device has no storage card"
 msgstr "不能傳送：裝置沒有記憶卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "是否在上傳到裝置前自動轉換下列書籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972
 msgid "Sending catalogs to device."
 msgstr "正在傳送分類到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073
 msgid "Sending news to device."
 msgstr "正在傳送新聞到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127
 msgid "Sending books to device."
 msgstr "正在傳送書籍到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167
 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:1231
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239
 msgid "No space on device"
 msgstr "裝置上已無空間"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>不能上傳書籍到裝置，因為已無更多可用空間 "
@@ -7537,7 +7569,7 @@ msgstr "選擇格式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191
 msgid "Format"
 msgstr "格式"
 
@@ -7675,7 +7707,7 @@ msgstr "確定(_O)"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
 msgid "&Cancel"
 msgstr "取消(_C)"
 
@@ -7722,8 +7754,8 @@ msgid "Location"
 msgstr "位置"
 
 #: /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:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241
@@ -7755,12 +7787,12 @@ msgid "Author sort"
 msgstr "作者排序"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433
 msgid "Invalid author name"
 msgstr "無效的作者姓名"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434
 msgid "Author names cannot contain & characters."
 msgstr "作者姓名不能包含 & 字元。"
 
@@ -7946,22 +7978,22 @@ msgid "Working"
 msgstr "工作中"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420
 msgid "Lower Case"
 msgstr "全小寫"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419
 msgid "Upper Case"
 msgstr "全大寫"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422
 msgid "Title Case"
 msgstr "書名大小寫"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423
 msgid "Capitalize"
 msgstr "全用大寫"
 
@@ -9468,12 +9500,12 @@ msgid "%s (was %s)"
 msgstr "%s (是 %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379
 msgid "Item is blank"
 msgstr "項目是空的"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380
 msgid "An item cannot be set to nothing. Delete it instead."
 msgstr "項目不能設為沒有。請刪除它來代替。"
 
@@ -9542,7 +9574,7 @@ msgid "Send test mail from %s to:"
 msgstr "從 %s 傳送測試郵件到："
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
 msgid "&Test"
 msgstr "測試(&T)"
 
@@ -9779,61 +9811,61 @@ msgstr ""
 msgid "Failed to download from %r with error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147
 msgid "Email %s to %s"
 msgstr "寄電子郵件 %s 到 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189
 msgid "News:"
 msgstr "新聞："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191
 msgid "Attached is the %s periodical downloaded by calibre."
 msgstr "附件是 %s 由 calibre 週期性下載的。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244
 msgid "E-book:"
 msgstr "電子書："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253
 msgid "Attached, you will find the e-book"
 msgstr "已附加，您會發現電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185
 msgid "by"
 msgstr "作者"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255
 msgid "in the %s format."
 msgstr "%s 格式。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270
 msgid "Sending email to"
 msgstr "傳送電子郵件到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301
 msgid "Auto convert the following books before sending via email?"
 msgstr "是否在透過電子郵件傳送前自動轉換下列書籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "無法透過電子郵件傳送前下列書籍，因為找不到適合的格式："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314
 msgid "Failed to email book"
 msgstr "無法寄出書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317
 msgid "sent"
 msgstr "已傳送"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342
 msgid "Sent news to"
 msgstr "傳送新聞到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 msgid ""
 "<div style=\"font-size:10pt;\">\n"
 "<p>Set a regular expression pattern to use when trying to guess ebook "
@@ -9847,67 +9879,85 @@ msgid ""
 "tooltips.</p></div>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
 msgid "Regular &expression"
 msgstr "正規表示式(&E)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
 msgid "File &name:"
 msgstr "檔案名稱(&N):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
 msgid "Title:"
 msgstr "書名："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138
 msgid "Regular expression (?P&lt;title&gt;)"
 msgstr "正規表示式 (?P&lt;title&gt;)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130
 msgid "No match"
 msgstr "沒有相符"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140
 msgid "Authors:"
 msgstr "作者："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141
 msgid "Regular expression (?P<author>)"
 msgstr "正規表示式 (?P<author>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143
 msgid "Series:"
 msgstr "系列："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144
 msgid "Regular expression (?P<series>)"
 msgstr "正規表示式 (?P<series>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146
 msgid "Series index:"
 msgstr "系列索引："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147
 msgid "Regular expression (?P<series_index>)"
 msgstr "正規表示式 (?P<series_index>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150
 msgid "Regular expression (?P<isbn>)"
 msgstr "正規表示式 (?P<isbn>)"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152
+msgid "Publisher:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153
+msgid "Regular expression (?P<publisher>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155
+msgid "Published:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156
+msgid "Regular expression (?P<published>)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Cover Browser"
 msgstr "封面瀏覽器"
@@ -10115,48 +10165,48 @@ msgstr "Y"
 msgid "Edit template"
 msgstr "編輯範本"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251
 msgid "On Device"
 msgstr "在裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311
 msgid "Size (MB)"
 msgstr "大小 (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394
 msgid "Book %s of %s."
 msgstr "書籍 %s / %s。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796
 msgid "The lookup/search name is \"{0}\""
 msgstr "尋找/搜尋的名稱是「{0}」"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313
 msgid "This book's UUID is \"{0}\""
 msgstr "這本書的 UUID 為「{0}」"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017
 msgid "In Library"
 msgstr "於書庫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021
 msgid "Size"
 msgstr "大小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211
 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:1296
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291
 msgid "Marked for deletion"
 msgstr "標記成要刪除"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "請雙擊以<b>編輯</b>我<br><br>"
 
@@ -10231,7 +10281,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "找不到搜尋語詞 <i>%s</i>的<b>任何符合項</b>。"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
 msgid "No matches found"
 msgstr "未發現符合項目"
 
@@ -10248,12 +10298,12 @@ msgid "LRF Viewer toolbar"
 msgstr "LRF 檢視器工具列"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558
 msgid "Next Page"
 msgstr "下一頁"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559
 msgid "Previous Page"
 msgstr "上一頁"
 
@@ -11066,25 +11116,32 @@ msgstr "成為預設值(&D)"
 msgid "&Remove email"
 msgstr "移除電子郵件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Auto send"
 msgstr "自動傳送"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27
 msgid "Email"
 msgstr "電子郵件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32
 msgid "Formats to email. The first matching format will be sent."
 msgstr "要寄出的格式。會將第一個符合的格式以電子郵件寄出。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33
+msgid ""
+"Subject of the email to use when sending. When left blank the title will be "
+"used for the subject. Also, the same templates used for \"Save to disk\" "
+"such as {title} and {author_sort} can be used here."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr "如果核取這個選項，已下載的新聞就會自動寄到這個<br>電子郵件位址（以列出的格式之一）。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115
 msgid "new email address"
 msgstr "新電子郵件位址"
 
@@ -11096,91 +11153,91 @@ msgstr "窄"
 msgid "Wide"
 msgstr "寬"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52
 msgid "Small"
 msgstr "小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53
 msgid "Large"
 msgstr "大"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Always"
 msgstr "永遠"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56
 msgid "Automatic"
 msgstr "自動"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57
 msgid "Never"
 msgstr "永不"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "By first letter"
 msgstr "依第一個字母"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60
 msgid "Disabled"
 msgstr "已停用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61
 msgid "Partitioned"
 msgstr "已分割"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140
 msgid "User Interface &layout (needs restart):"
 msgstr "使用者介面配置（需重新啟動）(&L):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "在瀏覽模式中要顯示的封面數（需重新啟動）(&N):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142
 msgid "Choose &language (requires restart):"
 msgstr "選擇語言（需重新啟動）(&L):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143
 msgid "Show &average ratings in the tags browser"
 msgstr "在標籤瀏覽器中顯示平均評等(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr "停用所有的動畫。對較慢/老舊的電腦很有用。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145
 msgid "Disable &animations"
 msgstr "停用動畫(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146
 msgid "Enable system &tray icon (needs restart)"
 msgstr "啟用系統匣圖示（需要重新啟動）(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147
 msgid "Show &splash screen at startup"
 msgstr "啟動時顯示歡迎畫面(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148
 msgid "Disable &notifications in system tray"
 msgstr "停用系統匣通知(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149
 msgid "Use &Roman numerals for series"
 msgstr "在系列編號中使用羅馬數字(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "在個別視窗中顯示封面瀏覽器（需要重新啟動）(&B)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151
 msgid "Tags browser category &partitioning method:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152
 msgid ""
 "Choose how tag browser subcategories are displayed when\n"
 "there are more items than the limit. Select by first\n"
@@ -11189,11 +11246,11 @@ msgid ""
 "if you never want subcategories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157
 msgid "&Collapse when more items than:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158
 msgid ""
 "If a Tag Browser category has more than this number of items, it is divided\n"
 "up into sub-categories. If the partition method is set to disable, this "
@@ -11202,11 +11259,11 @@ msgstr ""
 "如果標籤瀏覽器分類有多過這個數字的項目，就會被分割為\n"
 "子分類。如果分割方法設定為停用，這個數值會被忽略。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160
 msgid "Categories with &hierarchical items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161
 msgid ""
 "A comma-separated list of columns in which items containing\n"
 "periods are displayed in the tag browser trees. For example, if\n"
@@ -11216,64 +11273,60 @@ msgid ""
 "then the tags will be displayed each on their own line."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167
 msgid "&Toolbar"
 msgstr "工具列(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168
 msgid "&Icon size:"
 msgstr "圖示大小(&I):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169
 msgid "Show &text under icons:"
 msgstr "在圖示下方顯示文字(&T):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173
-msgid "&Split the toolbar into two toolbars"
-msgstr "將工具列分割為兩個工具列(&S)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170
 msgid "Interface font:"
 msgstr "介面字型："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171
 msgid "Change &font (needs restart)"
 msgstr "改變字型（需要重新啟動）(&F)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96
 msgid "&Apply"
 msgstr "套用(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235
 msgid "Restore &defaults"
 msgstr "還原為預設值(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236
 msgid "Save changes"
 msgstr "儲存變更"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237
 msgid "Cancel and return to overview"
 msgstr "取消並返回概覽"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293
 msgid "Restoring to defaults not supported for"
 msgstr "還原為預設值不支援"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328
 msgid ""
 "Some of the changes you made require a restart. Please restart calibre as "
 "soon as possible."
 msgstr "您進行的變更中有部分需要重新啟動。請儘快重新啟動 calibre。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
 msgid ""
 "The changes you have made require calibre be restarted immediately. You will "
 "not be allowed set any more preferences, until you restart."
 msgstr "您進行的變更中有部分需要 calibre 立刻重新啟動。除非您重新啟動，否則將無法進行任何偏好設定的設定。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132
 msgid "Restart needed"
 msgstr "需要重新啟動"
@@ -12016,30 +12069,34 @@ msgid "The main toolbar"
 msgstr "主工具列"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211
+msgid "The optional second toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
 msgid "The main toolbar when a device is connected"
 msgstr "當裝置連接時的主要工具列"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213
 msgid "The context menu for the books in the calibre library"
 msgstr "書籍在 calibre 書庫中的關聯選單"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215
 msgid "The context menu for the books on the device"
 msgstr "書籍在裝置上的關聯選單"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
 msgid "Cannot add"
 msgstr "不能加入"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250
 msgid "Cannot add the actions %s to this location"
 msgstr "不能將動作 %s 加入這個位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
 msgid "Cannot remove"
 msgstr "不能移除"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269
 msgid "Cannot remove the actions %s from this location"
 msgstr "不能從這個位置移除動作 %s"
 
@@ -12136,7 +12193,7 @@ msgstr "套用您對這個調整進行的任何變更"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652
 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280
 msgid "Search"
 msgstr "搜尋"
@@ -12229,166 +12286,166 @@ msgstr "點選以變更"
 msgid "&Alternate shortcut:"
 msgstr "替代的捷徑鍵(&A):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403
 msgid "Rename %s"
 msgstr "重新命名 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348
 msgid "Edit sort for %s"
 msgstr "編輯 %s 的排序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355
 msgid "Add %s to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368
 msgid "Children of %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
 msgid "Delete search %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
 msgid "Remove %s from category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390
 msgid "Search for %s"
 msgstr "搜尋 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
 msgid "Search for everything but %s"
 msgstr "搜尋 %s 以外的項目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407
 msgid "Add sub-category to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411
 msgid "Delete user category %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416
 msgid "Hide category %s"
 msgstr "隱藏分類 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420
 msgid "Show category"
 msgstr "顯示所有的分類"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430
 msgid "Search for books in category %s"
 msgstr "搜尋分類 %s 的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436
 msgid "Search for books not in category %s"
 msgstr "搜尋不在分類 %s 中的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450
 msgid "Manage %s"
 msgstr "管理 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
 msgid "Manage Saved Searches"
 msgstr "管理已儲存的搜尋"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465
 msgid "Manage User Categories"
 msgstr "管理使用者分類"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472
 msgid "Show all categories"
 msgstr "顯示所有的分類"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475
 msgid "Change sub-categorization scheme"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791
 msgid "The grouped search term name is \"{0}\""
 msgstr "群組搜尋字詞名稱為「{0}」"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063
 msgid ""
 "Changing the authors for several books can take a while. Are you sure?"
 msgstr "改變多本書籍的作者會花上一些時間。您確定嗎？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068
 msgid ""
 "Changing the metadata for that many books can take a while. Are you sure?"
 msgstr "改變許多書籍的元數據會花上一些時間。您確定嗎？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413
 msgid "Searches"
 msgstr "搜尋"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414
 msgid "Rename user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386
 msgid "You cannot use periods in the name when renaming user categories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415
 msgid "The name %s is already used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438
 msgid "Duplicate search name"
 msgstr "重複的搜尋名稱"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439
 msgid "The saved search name %s is already used."
 msgstr "已儲存搜尋名稱 %s 已經使用了。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841
 msgid "New Category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895
 msgid "Delete user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893
 msgid "%s is not a user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896
 msgid "%s contains items. Do you really want to delete it?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917
 msgid "Remove category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918
 msgid "User category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937
 msgid "Add to user category"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938
 msgid "A user category %s does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
 msgid "Find item in tag browser"
 msgstr "尋找標籤瀏覽器的項目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064
 msgid ""
 "Search for items. This is a \"contains\" search; items containing the\n"
 "text anywhere in the name will be found. You can limit the search\n"
@@ -12404,60 +12461,60 @@ msgstr ""
 "輸入 *foo 會一次過濾所有的分類，只顯示那些\n"
 "含有文字「foo」的項目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073
 msgid "ALT+f"
 msgstr "ALT+f"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077
 msgid "F&ind"
 msgstr "尋找(&I)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078
 msgid "Find the first/next matching item"
 msgstr "尋找第一個/下一個符合的項目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083
 msgid "Collapse all categories"
 msgstr "收摺所有的分類"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107
 msgid "No More Matches.</b><p> Click Find again to go to first match"
 msgstr "沒有其他符合項。</b><p>再按一次尋找會回瀏第一個符合項"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by name"
 msgstr "依名稱排序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120
 msgid "Sort by popularity"
 msgstr "依熱門程度排序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121
 msgid "Sort by average rating"
 msgstr "依平均評等排序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124
 msgid "Set the sort order for entries in the Tag Browser"
 msgstr "設定標籤瀏覽器中項目的排序順序"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match all"
 msgstr "符合全部"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131
 msgid "Match any"
 msgstr "符合任何"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136
 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:2127
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140
 msgid "Manage &user categories"
 msgstr "管理使用者分類(&U)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143
 msgid "Add your own categories to the Tag Browser"
 msgstr "加入您自己的分類至標籤瀏覽器"
 
@@ -12530,23 +12587,23 @@ msgid ""
 "automatically."
 msgstr "您已經以除錯模式啟動 calibre。在您結束 calibre 後，除錯紀錄會儲存到檔案：%s<p>紀錄檔會自動顯示。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "轉換時發生錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528
 msgid "Recipe Disabled"
 msgstr "食譜已停用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544
 msgid "<b>Failed</b>"
 msgstr "<b>失敗</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "還有使用中的工作。您確定要結束？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -12556,11 +12613,11 @@ msgstr ""
 "                      現在結束可能造成裝置上的損毀。<br>\n"
 "                      您確定要結束？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584
 msgid "Active jobs"
 msgstr "使用中工作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -12764,7 +12821,7 @@ msgid "Options to customize the ebook viewer"
 msgstr "用來自訂電子書檢視器的選項"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783
 msgid "Remember last used window size"
 msgstr "記住上次使用的視窗大小"
 
@@ -12842,36 +12899,36 @@ msgid ""
 "clicking outside the  shortcut editing box."
 msgstr "您正在編輯鍵盤捷徑鍵途中，請先將它完成，也就是點選捷徑鍵編輯方塊以外的地方。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
 msgid "&Lookup in dictionary"
 msgstr "在字典中查詢(&L)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141
 msgid "Go to..."
 msgstr "移至..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549
 msgid "Next Section"
 msgstr "下一節"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550
 msgid "Previous Section"
 msgstr "上一節"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552
 msgid "Document Start"
 msgstr "文件的開頭"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553
 msgid "Document End"
 msgstr "文件的結尾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555
 msgid "Section Start"
 msgstr "章節開頭"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556
 msgid "Section End"
 msgstr "章節結尾"
 
@@ -12947,73 +13004,73 @@ msgstr "預覽列印"
 msgid "Clear list of recently opened books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
 msgstr "連線到 dict.org 查詢：<b>%s</b>&hellip;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467
 msgid "Choose ebook"
 msgstr "選擇電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468
 msgid "Ebooks"
 msgstr "電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504
 msgid "No matches found for: %s"
 msgstr "找不到符合項：%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541
 msgid "Loading flow..."
 msgstr "正在載入 flow..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Laying out %s"
 msgstr "正在配置 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610
 msgid "Bookmark #%d"
 msgstr "書籤 #%d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614
 msgid "Add bookmark"
 msgstr "加入書籤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615
 msgid "Enter title for bookmark:"
 msgstr "請輸入書籤的標題："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625
 msgid "Manage Bookmarks"
 msgstr "管理書籤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Loading ebook..."
 msgstr "正在載入電子書..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Could not open ebook"
 msgstr "無法開啟電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770
 msgid "Options to control the ebook viewer"
 msgstr "用來控制電子書檢視器的選項"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr "如果指定了，檢視器視窗在啟動時會嘗試移至最上層。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780
 msgid ""
 "If specified, viewer window will try to open full screen when started."
 msgstr "如果指定，檢視器視窗會在啟動時嘗試開啟全螢幕。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785
 msgid "Print javascript alert and console messages to the console"
 msgstr "在主控台中顯示 javascript 警示及主控台訊息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -13091,27 +13148,27 @@ msgstr "尋找上一個出現"
 msgid "Print eBook"
 msgstr "列印電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418
 msgid "Change Case"
 msgstr "變更大小寫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421
 msgid "Swap Case"
 msgstr "大小寫互換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961
 msgid "Drag to resize"
 msgstr "拖放以重設大小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996
 msgid "Show"
 msgstr "顯示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003
 msgid "Hide"
 msgstr "隱藏"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040
 msgid "Toggle"
 msgstr "切換"
 
@@ -14351,11 +14408,11 @@ msgstr ""
 "\n"
 "需要個別指令的說明： %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
 msgid "No label was provided"
 msgstr "沒有提供標籤"
 
-#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591
+#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593
 msgid ""
 "The label must contain only lower case letters, digits and underscores, and "
 "start with a letter"
@@ -14369,15 +14426,15 @@ msgstr "%s平均評等為 %3.1f"
 msgid "Main"
 msgstr "主要"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>將舊的資料庫轉移到 %s 的電子書庫<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080
 msgid "Copying <b>%s</b>"
 msgstr "正在複製 <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097
 msgid "Compacting database"
 msgstr "正在壓實資料庫"
 
@@ -15418,101 +15475,101 @@ msgstr "不要從 calibre 伺服器下載最新版的內建食譜"
 msgid "Unknown News Source"
 msgstr "未知的新聞來源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "「%s」食譜需要使用者名稱和密碼。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736
 msgid "Download finished"
 msgstr "下載完成"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Failed to download the following articles:"
 msgstr "無法下載下列文章："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744
 msgid "Failed to download parts of the following articles:"
 msgstr "無法下載下列文章的部分："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746
 msgid " from "
 msgstr " 來自 "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748
 msgid "\tFailed links:"
 msgstr "\t失敗的連結："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Could not fetch article."
 msgstr "無法取得文章。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845
 msgid "The debug traceback is available earlier in this log"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847
 msgid "Run with -vv to see the reason"
 msgstr "以 -vv 執行以查看原因"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870
 msgid "Fetching feeds..."
 msgstr "正在取回餵送..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875
 msgid "Got feeds from index page"
 msgstr "從索引頁取得餵送"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884
 msgid "Trying to download cover..."
 msgstr "正在嘗試下載封面..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966
 msgid "Starting download [%d thread(s)]..."
 msgstr "開始下載 [%d 執行緒]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982
 msgid "Feeds downloaded to %s"
 msgstr "將餵送下載到 %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991
 msgid "Could not download cover: %s"
 msgstr "無法下載封面：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 msgid "Downloading cover from %s"
 msgstr "正在從 %s 下載封面"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214
 msgid "Untitled Article"
 msgstr "無標題的文章"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285
 msgid "Article downloaded: %s"
 msgstr "已下載的文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296
 msgid "Article download failed: %s"
 msgstr "下載失敗的文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313
 msgid "Fetching feed"
 msgstr "正在取回餵送"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460
 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:1474
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475
 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."
@@ -15627,6 +15684,9 @@ msgstr ""
 msgid "Do not download CSS stylesheets."
 msgstr "不要下載 CSS 樣式表。"
 
+#~ msgid "No valid plugin found in "
+#~ msgstr "沒有在 中找到合適的外掛程式 "
+
 #~ msgid ""
 #~ "The line height in pts. Controls spacing between consecutive lines of text. "
 #~ "By default no line height manipulation is performed."
@@ -15902,9 +15962,6 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "Show &notifications in system tray"
 #~ msgstr "在系統匣中顯示通知(&N)"
 
-#~ msgid "Toolbar"
-#~ msgstr "工具列"
-
 #~ msgid "Select visible &columns in library view"
 #~ msgstr "選擇在書庫檢視中顯示的欄位(&C)"
 
@@ -16456,6 +16513,9 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "Check Library"
 #~ msgstr "檢查書庫"
 
+#~ msgid "Customize the toolbar"
+#~ msgstr "自訂工具列"
+
 #~ msgid "Communicate with the Booq Avant"
 #~ msgstr "與 Booq Avant 連接"
 
@@ -16650,6 +16710,9 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "Collapse when more items than:"
 #~ msgstr "收摺用於項目超過："
 
+#~ msgid "&Split the toolbar into two toolbars"
+#~ msgstr "將工具列分割為兩個工具列(&S)"
+
 #~ msgid "Plugin {0} successfully removed"
 #~ msgstr "外掛程式 {0} 已成功的移除"
 
@@ -16674,6 +16737,9 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "Use &Roman numerals for series number"
 #~ msgstr "在系列編號使用羅馬數字(&R)"
 
+#~ msgid "Customize searching"
+#~ msgstr "自訂搜尋"
+
 #~ msgid ""
 #~ "To use librarything.com you must sign up for a %sfree account%s and enter "
 #~ "your username and password separated by a : below."
diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index 66316d051b..078971428d 100644
--- a/src/calibre/utils/config.py
+++ b/src/calibre/utils/config.py
@@ -785,6 +785,9 @@ def write_tweaks(raw):
 
 tweaks = read_tweaks()
 test_eight_code = tweaks.get('test_eight_code', False)
+# test_eight_code notes
+# Change documentation of bool columns are tristate to indicate that it can be
+# overridden on a per library basis via Preferences->Custom columns
 
 def migrate():
     if hasattr(os, 'geteuid') and os.geteuid() == 0: